Add status field to track toleration modifications

Introduce a new status field to track addition of tolerations in the rook-ceph-operator-config configmap. The added field status indicates whether tolerations were successfully added to the configmap. This information is crucial for ensuring safe deletion, as we will only proceed with deletion if the tolerations were added by our mechanism. If they were added by user we will not proceed with the deletion. Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
red-hat-storage · Mar 18, 2024 · 83168dd · 83168dd
1 parent 630fdd6
commit 83168dd
Showing 7 changed files with 89 additions and 8 deletions.
diff --git a/api/v1/ocsinitialization_types.go b/api/v1/ocsinitialization_types.go
@@ -54,10 +54,18 @@ type OCSInitializationStatus struct {
 	// operator. Object references will be added to this list after they have
 	// been created AND found in the cluster.
 	// +optional
-	RelatedObjects                []corev1.ObjectReference `json:"relatedObjects,omitempty"`
-	ErrorMessage                  string                   `json:"errorMessage,omitempty"`
-	SCCsCreated                   bool                     `json:"sCCsCreated,omitempty"`
-	RookCephOperatorConfigCreated bool                     `json:"rookCephOperatorConfigCreated,omitempty"`
+	RelatedObjects                []corev1.ObjectReference     `json:"relatedObjects,omitempty"`
+	ErrorMessage                  string                       `json:"errorMessage,omitempty"`
+	SCCsCreated                   bool                         `json:"sCCsCreated,omitempty"`
+	RookCephOperatorConfigCreated bool                         `json:"rookCephOperatorConfigCreated,omitempty"`
+	RookCephOperatorConfig        RookCephOperatorConfigStatus `json:"rookCephOperatorConfig,omitempty"`
+}
+
+type RookCephOperatorConfigStatus struct {
+	// CsiPluginTolerationsModified indicates if CsiPluginTolerations are added to the configmap via controller
+	CsiPluginTolerationsModified bool `json:"csiPluginTolerationsModified,omitempty"`
+	// CsiProvisionerTolerationsModified indicates if CsiProvisionerTolerations are added to the configmap via controller
+	CsiProvisionerTolerationsModified bool `json:"csiProvisionerTolerationsModified,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/ocs.openshift.io_ocsinitializations.yaml b/config/crd/bases/ocs.openshift.io_ocsinitializations.yaml
@@ -196,6 +196,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              rookCephOperatorConfig:
+                properties:
+                  csiPluginTolerationsModified:
+                    description: CsiPluginTolerationsModified indicates if CsiPluginTolerations
+                      are added to the configmap via controller
+                    type: boolean
+                  csiProvisionerTolerationsModified:
+                    description: CsiProvisionerTolerationsModified indicates if CsiProvisionerTolerations
+                      are added to the configmap via controller
+                    type: boolean
+                type: object
               rookCephOperatorConfigCreated:
                 type: boolean
               sCCsCreated:

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_ocsinitializations.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_ocsinitializations.yaml
@@ -196,6 +196,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              rookCephOperatorConfig:
+                properties:
+                  csiPluginTolerationsModified:
+                    description: CsiPluginTolerationsModified indicates if CsiPluginTolerations
+                      are added to the configmap via controller
+                    type: boolean
+                  csiProvisionerTolerationsModified:
+                    description: CsiProvisionerTolerationsModified indicates if CsiProvisionerTolerations
+                      are added to the configmap via controller
+                    type: boolean
+                type: object
               rookCephOperatorConfigCreated:
                 type: boolean
               sCCsCreated:

diff --git a/deploy/ocs-operator/manifests/ocsinitialization.crd.yaml b/deploy/ocs-operator/manifests/ocsinitialization.crd.yaml
@@ -195,6 +195,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              rookCephOperatorConfig:
+                properties:
+                  csiPluginTolerationsModified:
+                    description: CsiPluginTolerationsModified indicates if CsiPluginTolerations
+                      are added to the configmap via controller
+                    type: boolean
+                  csiProvisionerTolerationsModified:
+                    description: CsiProvisionerTolerationsModified indicates if CsiProvisionerTolerations
+                      are added to the configmap via controller
+                    type: boolean
+                type: object
               rookCephOperatorConfigCreated:
                 type: boolean
               sCCsCreated:

diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/ocsinitialization_types.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/ocsinitialization_types.go
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go