converge: fixes in svg after upgrade

Signed-off-by: Leela Venkaiah G <[email protected]>
red-hat-storage · Jan 24, 2025 · d93255c · d93255c
1 parent 5a5f2f7
commit d93255c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/controllers/ocsinitialization/ocsinitialization_controller.go b/controllers/ocsinitialization/ocsinitialization_controller.go
@@ -501,11 +501,6 @@ func (r *OCSInitializationReconciler) getCsiTolerations(csiTolerationKey string)
 // When any value in the configmap is updated, the rook-ceph-operator pod is restarted to pick up the new values.
 func (r *OCSInitializationReconciler) ensureOcsOperatorConfigExists(initialData *ocsv1.OCSInitialization) error {
 
-<<<<<<< HEAD
-	allowConsumers := slices.ContainsFunc(r.clusters.GetInternalStorageClusters(), func(sc ocsv1.StorageCluster) bool {
-		return sc.Spec.AllowRemoteStorageConsumers
-	})
-
 	enableCephfsVal, err := r.getEnableCephfsKeyValue()
 	if err != nil {
 		r.Log.Error(err, "Failed to get enableCephfsKeyValue")
@@ -519,7 +514,6 @@ func (r *OCSInitializationReconciler) ensureOcsOperatorConfigExists(initialData
 		util.TopologyDomainLabelsKey:     r.getTopologyDomainLabelsKeyValue(),
 		util.EnableNFSKey:                r.getEnableNFSKeyValue(),
 		util.EnableCephfsKey:             enableCephfsVal,
-		util.DisableCSIDriverKey:         strconv.FormatBool(allowConsumers),
 		util.DisableCSIDriverKey:         strconv.FormatBool(true),
 	}
 

diff --git a/controllers/storageconsumer/storageconsumer_controller.go b/controllers/storageconsumer/storageconsumer_controller.go
@@ -469,6 +469,11 @@ func (r *StorageConsumerReconciler) reconcileCephFilesystemSubVolumeGroup() erro
 			}
 			// we are not tracking the data pool as it was same in both internal and provider mode
 			r.cephFilesystemSubVolumeGroup.Spec.FilesystemName = cephFs.Name
+			if existingSvgName != "" {
+				r.cephFilesystemSubVolumeGroup.Spec.Name = existingSvgName
+			} else {
+				r.cephFilesystemSubVolumeGroup.Spec.Name = r.cephFilesystemSubVolumeGroup.Name
+			}
 			return nil
 		}); err != nil {
 			return err

diff --git a/services/provider/server/server.go b/services/provider/server/server.go
@@ -696,7 +696,7 @@ func (s *OCSProviderServer) getExternalResources(ctx context.Context, consumerRe
 				internalMappingRequired = true
 			} else {
 				clientProfile.Spec.CephFs = &csiopv1a1.CephFsConfigSpec{
-					SubVolumeGroup:     svg.Name,
+					SubVolumeGroup:     svg.Spec.Name,
 					KernelMountOptions: kernelMountOptions,
 				}
 				vscName = storageCluster.Name