From f9ebaf3418155fa5999490777a42dbd5c02a73eb Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 13 Jan 2025 16:32:06 -0700 Subject: [PATCH] csi: set driver name to same as the operator namespace The operator namespace is where the csi driver resources are being created. The prefix is expected to match the namespace where the driver is being created. It was an incorrect change from 15245 where it had been assumed that the cluster prefix name was required instead. Signed-off-by: Travis Nielsen --- pkg/operator/ceph/csi/operator_driver.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/operator/ceph/csi/operator_driver.go b/pkg/operator/ceph/csi/operator_driver.go index ae111c6a8..f5457be45 100644 --- a/pkg/operator/ceph/csi/operator_driver.go +++ b/pkg/operator/ceph/csi/operator_driver.go @@ -77,7 +77,7 @@ func (r *ReconcileCSI) createOrUpdateDriverResources(cluster cephv1.CephCluster, } func (r *ReconcileCSI) createOrUpdateRBDDriverResource(cluster cephv1.CephCluster, clusterInfo *cephclient.ClusterInfo) error { - resourceName := fmt.Sprintf("%s.rbd.csi.ceph.com", cluster.Namespace) + resourceName := fmt.Sprintf("%s.rbd.csi.ceph.com", r.opConfig.OperatorNamespace) spec, err := r.generateDriverSpec(cluster.Name) if err != nil { return err @@ -123,7 +123,7 @@ func (r *ReconcileCSI) createOrUpdateRBDDriverResource(cluster cephv1.CephCluste } func (r *ReconcileCSI) createOrUpdateCephFSDriverResource(cluster cephv1.CephCluster, clusterInfo *cephclient.ClusterInfo) error { - resourceName := fmt.Sprintf("%s.cephfs.csi.ceph.com", cluster.Namespace) + resourceName := fmt.Sprintf("%s.cephfs.csi.ceph.com", r.opConfig.OperatorNamespace) spec, err := r.generateDriverSpec(cluster.Name) if err != nil { return err @@ -175,7 +175,7 @@ func (r *ReconcileCSI) createOrUpdateCephFSDriverResource(cluster cephv1.CephClu } func (r *ReconcileCSI) createOrUpdateNFSDriverResource(cluster cephv1.CephCluster, clusterInfo *cephclient.ClusterInfo) error { - resourceName := fmt.Sprintf("%s.nfs.csi.ceph.com", cluster.Namespace) + resourceName := fmt.Sprintf("%s.nfs.csi.ceph.com", r.opConfig.OperatorNamespace) spec, err := r.generateDriverSpec(cluster.Name) if err != nil { return err