Merge pull request #15245 from travisn/csi-operator-cleanup

csi: Set correct driver name with csi operator
This commit is contained in:
subham rai authored and GitHub committed 2025-01-09 12:26:24 +05:30
commit 77b6565c4f
2 files changed
+7 -7

No files matched your search

+4 -4
View File
@@ -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", r.opConfig.OperatorNamespace)
resourceName := fmt.Sprintf("%s.rbd.csi.ceph.com", cluster.Namespace)
spec, err := r.generateDriverSpec(cluster.Name)
if err != nil {
return err
@@ -116,14 +116,14 @@ func (r *ReconcileCSI) createOrUpdateRBDDriverResource(cluster cephv1.CephCluste
err = r.createOrUpdateDriverResource(clusterInfo, rbdDriver)
if err != nil {
return errors.Wrapf(err, "failed to create or update RDB driver resource %q", rbdDriver.Name)
return errors.Wrapf(err, "failed to create or update RBD driver resource %q", rbdDriver.Name)
}
return nil
}
func (r *ReconcileCSI) createOrUpdateCephFSDriverResource(cluster cephv1.CephCluster, clusterInfo *cephclient.ClusterInfo) error {
resourceName := fmt.Sprintf("%s.cephfs.csi.ceph.com", r.opConfig.OperatorNamespace)
resourceName := fmt.Sprintf("%s.cephfs.csi.ceph.com", cluster.Namespace)
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", r.opConfig.OperatorNamespace)
resourceName := fmt.Sprintf("%s.nfs.csi.ceph.com", cluster.Namespace)
spec, err := r.generateDriverSpec(cluster.Name)
if err != nil {
return err
+3 -3
View File
@@ -131,7 +131,7 @@ func (o *Operator) runCRDManager() {
// The operator config manager is also watching for changes here so if the operator config map
// content changes for ROOK_CURRENT_NAMESPACE_ONLY we must reload the operator CRD manager
o.namespaceToWatch(opManagerContext)
o.namespaceToWatch()
// Pass the parent context to the cluster controller so that the monitoring go routines can
// consume it to terminate gracefully
@@ -148,11 +148,11 @@ func (o *Operator) runCRDManager() {
}()
}
func (o *Operator) namespaceToWatch(context context.Context) {
func (o *Operator) namespaceToWatch() {
currentNamespaceOnly, _ := k8sutil.GetOperatorSetting(opManagerContext, o.context.Clientset, opcontroller.OperatorSettingConfigMapName, "ROOK_CURRENT_NAMESPACE_ONLY", "true")
if currentNamespaceOnly == "true" {
o.config.NamespaceToWatch = o.config.OperatorNamespace
logger.Infof("watching the current namespace %q for a Ceph CRs", o.config.OperatorNamespace)
logger.Infof("watching the current namespace %q for Ceph CRs", o.config.OperatorNamespace)
} else {
o.config.NamespaceToWatch = v1.NamespaceAll
logger.Infof("watching all namespaces for Ceph CRs")