Expose storageCluster flag to allow updating of the OSD device classes

Earlier the device class of an OSD was determined at provisioning and it was not possible to update thereafter. In some scenarios the admin may want to force update the device class to a new value. To avoid accidental updates, rook requires first setting allowDeviceClassUpdate in the storage spec of the cephcluster for which we are exposing a new flag at Spec.ManagedResources.CephCluster.AllowDeviceClassUpdate. Signed-off-by: Malay Kumar Parida <[email protected]>
red-hat-storage · Jul 26, 2024 · 9602701 · 9602701
1 parent 04e80da
commit 9602701
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 0 deletions.
diff --git a/api/v1/storagecluster_types.go b/api/v1/storagecluster_types.go
@@ -213,6 +213,8 @@ type ManageCephCluster struct {
 	// +kubebuilder:validation:Maximum=1.0
 	// +nullable
 	BackfillFullRatio *float64 `json:"backfillFullRatio,omitempty"`
+	// Whether to allow updating the device class after the OSD is initially provisioned
+	AllowDeviceClassUpdate bool `json:"allowDeviceClassUpdate,omitempty"`
 }
 
 // ManageCephConfig defines how to reconcile the Ceph configuration

diff --git a/config/crd/bases/ocs.openshift.io_storageclusters.yaml b/config/crd/bases/ocs.openshift.io_storageclusters.yaml
@@ -737,6 +737,10 @@ spec:
                     description: ManageCephCluster defines how to reconcile the Ceph
                       cluster definition
                     properties:
+                      allowDeviceClassUpdate:
+                        description: Whether to allow updating the device class after
+                          the OSD is initially provisioned
+                        type: boolean
                       backfillFullRatio:
                         description: BackfillFullRatio is the ratio at which the cluster
                           is too full for backfill. Backfill will be disabled if above

diff --git a/controllers/storagecluster/cephcluster.go b/controllers/storagecluster/cephcluster.go
@@ -445,6 +445,7 @@ func newCephCluster(sc *ocsv1.StorageCluster, cephImage string, kmsConfigMap *co
 				Interval: &metav1.Duration{Duration: 30 * time.Second},
 			},
 			Storage: rookCephv1.StorageScopeSpec{
+				AllowDeviceClassUpdate:       sc.Spec.ManagedResources.CephCluster.AllowDeviceClassUpdate,
 				StorageClassDeviceSets:       newStorageClassDeviceSets(sc),
 				FlappingRestartIntervalHours: 24,
 				FullRatio:                    sc.Spec.ManagedResources.CephCluster.FullRatio,

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml
@@ -737,6 +737,10 @@ spec:
                     description: ManageCephCluster defines how to reconcile the Ceph
                       cluster definition
                     properties:
+                      allowDeviceClassUpdate:
+                        description: Whether to allow updating the device class after
+                          the OSD is initially provisioned
+                        type: boolean
                       backfillFullRatio:
                         description: BackfillFullRatio is the ratio at which the cluster
                           is too full for backfill. Backfill will be disabled if above

diff --git a/deploy/ocs-operator/manifests/storagecluster.crd.yaml b/deploy/ocs-operator/manifests/storagecluster.crd.yaml
@@ -737,6 +737,10 @@ spec:
                     description: ManageCephCluster defines how to reconcile the Ceph
                       cluster definition
                     properties:
+                      allowDeviceClassUpdate:
+                        description: Whether to allow updating the device class after
+                          the OSD is initially provisioned
+                        type: boolean
                       backfillFullRatio:
                         description: BackfillFullRatio is the ratio at which the cluster
                           is too full for backfill. Backfill will be disabled if above

diff --git a/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go