Stop usage of DisableStorageClass & DisableSnapshotClass fields

As these 2 fields are now marked as deprecated, we are removing the
usage of these fields.

Signed-off-by: Malay Kumar Parida <[email protected]>

Author: malayparida2000

controllers/storagecluster/storageclasses.go

@@ -31,7 +31,6 @@ const (
 type StorageClassConfiguration struct {
 	storageClass      *storagev1.StorageClass
 	reconcileStrategy ReconcileStrategy
-	disable           bool
 	isClusterExternal bool
 }
 
@@ -93,7 +92,7 @@ func (obj *ocsStorageClass) ensureDeleted(r *StorageClusterReconciler, instance
 func (r *StorageClusterReconciler) createStorageClasses(sccs []StorageClassConfiguration, namespace string) error {
 	var skippedSC []string
 	for _, scc := range sccs {
-		if scc.reconcileStrategy == ReconcileStrategyIgnore || scc.disable {
+		if scc.reconcileStrategy == ReconcileStrategyIgnore {
 			continue
 		}
 		sc := scc.storageClass
@@ -276,7 +275,6 @@ func newCephFilesystemStorageClassConfiguration(initData *ocsv1.StorageCluster)
 			},
 		},
 		reconcileStrategy: ReconcileStrategy(managementSpec.ReconcileStrategy),
-		disable:           managementSpec.DisableStorageClass,
 		isClusterExternal: initData.Spec.ExternalStorage.Enable,
 	}
 }
@@ -314,7 +312,6 @@ func newCephBlockPoolStorageClassConfiguration(initData *ocsv1.StorageCluster) S
 			},
 		},
 		reconcileStrategy: ReconcileStrategy(managementSpec.ReconcileStrategy),
-		disable:           managementSpec.DisableStorageClass,
 		isClusterExternal: initData.Spec.ExternalStorage.Enable,
 	}
 	if initData.Spec.ManagedResources.CephBlockPools.DefaultStorageClass {
@@ -448,7 +445,6 @@ func newCephOBCStorageClassConfiguration(initData *ocsv1.StorageCluster) Storage
 			},
 		},
 		reconcileStrategy: ReconcileStrategy(managementSpec.ReconcileStrategy),
-		disable:           managementSpec.DisableStorageClass,
 		isClusterExternal: initData.Spec.ExternalStorage.Enable,
 	}
 }

controllers/storagecluster/volumesnapshotterclasses.go

@@ -36,7 +36,6 @@ const (
 type SnapshotClassConfiguration struct {
 	snapshotClass     *snapapi.VolumeSnapshotClass
 	reconcileStrategy ReconcileStrategy
-	disable           bool
 }
 
 // newVolumeSnapshotClass returns a new VolumeSnapshotter class backed by provided snapshotter type
@@ -61,15 +60,13 @@ func newCephFilesystemSnapshotClassConfiguration(instance *ocsv1.StorageCluster)
 	return SnapshotClassConfiguration{
 		snapshotClass:     newVolumeSnapshotClass(instance, cephfsSnapshotter),
 		reconcileStrategy: ReconcileStrategy(instance.Spec.ManagedResources.CephFilesystems.ReconcileStrategy),
-		disable:           instance.Spec.ManagedResources.CephFilesystems.DisableSnapshotClass || instance.Spec.AllowRemoteStorageConsumers,
 	}
 }
 
 func newCephBlockPoolSnapshotClassConfiguration(instance *ocsv1.StorageCluster) SnapshotClassConfiguration {
 	return SnapshotClassConfiguration{
 		snapshotClass:     newVolumeSnapshotClass(instance, rbdSnapshotter),
 		reconcileStrategy: ReconcileStrategy(instance.Spec.ManagedResources.CephBlockPools.ReconcileStrategy),
-		disable:           instance.Spec.ManagedResources.CephBlockPools.DisableSnapshotClass || instance.Spec.AllowRemoteStorageConsumers,
 	}
 }
 
@@ -94,7 +91,7 @@ func newSnapshotClassConfigurations(instance *ocsv1.StorageCluster) []SnapshotCl
 func (r *StorageClusterReconciler) createSnapshotClasses(vsccs []SnapshotClassConfiguration) error {
 
 	for _, vscc := range vsccs {
-		if vscc.reconcileStrategy == ReconcileStrategyIgnore || vscc.disable {
+		if vscc.reconcileStrategy == ReconcileStrategyIgnore {
 			continue
 		}
 

deploy/single-node-storagecluster-provider.yaml

@@ -52,12 +52,8 @@ spec:
     # reconcileStrategy: ignore
     disableLoadBalancerService: true
   managedResources:
-    cephBlockPools:
-      disableSnapshotClass: true
-      disableStorageClass: true
-    cephFilesystems:
-      disableSnapshotClass: true
-      disableStorageClass: true
+    cephBlockPools: {}
+    cephFilesystems: {}
     cephObjectStores:
       hostNetwork: false
     cephCluster: {}