Address latest review feedback

Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
operator-framework · May 13, 2024 · c4dd907 · c4dd907
1 parent e35ad16
commit c4dd907
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
@@ -86,22 +86,26 @@ type PreflightConfig struct {
 }
 
 // CRDUpgradeSafetyPreflightConfig is a custom struct that holds the necessary configuration values to
-// enable or disable the CRD Upgrade Safety validations. Currently, this holds CRDUpgradeSafetyPreflightConfigType
+// enable or disable the CRD Upgrade Safety validations. Currently, this holds Mode
 // that sets the CRD Upgrade Safety validations to either Enabled/Disabled.
+// By default, this is set to "Enabled".
 type CRDUpgradeSafetyPreflightConfig struct {
-	CRDUpgradeSafetyPreflightConfigType CRDUpgradeSafetyPreflightConfigType `json:"crdUpgradeSafetyPreflightConfigType,omitempty"`
+	//+kubebuilder:validation:Enum:=Enabled;Disabled
+	//+kubebuilder:default:=Enabled
+	//+kubebuilder:Optional
+	Mode Mode `json:"mode,omitempty"`
 }
 
-type CRDUpgradeSafetyPreflightConfigType string
+type Mode string
 
 const (
 	// CRDUpgradeSafetyPreflightConfigEnabled represents the default state for the
 	// CRD Upgrade Safety validations by setting it to "Enabled".
-	CRDUpgradeSafetyPreflightConfigEnabled CRDUpgradeSafetyPreflightConfigType = "Enabled"
+	CRDUpgradeSafetyPreflightConfigEnabled Mode = "Enabled"
 
 	// CRDUpgradeSafetyPreflightConfigDisabled represents the option for the
 	// CRD Upgrade Safety validations to be disabled by setting it to "Disabled".
-	CRDUpgradeSafetyPreflightConfigDisabled CRDUpgradeSafetyPreflightConfigType = "Disabled"
+	CRDUpgradeSafetyPreflightConfigDisabled Mode = "Disabled"
 )
 
 const (

diff --git a/config/crd/bases/olm.operatorframework.io_clusterextensions.yaml b/config/crd/bases/olm.operatorframework.io_clusterextensions.yaml
@@ -64,10 +64,15 @@ spec:
                   crdUpgradeSafety:
                     description: |-
                       CRDUpgradeSafetyPreflightConfig is a custom struct that holds the necessary configuration values to
-                      enable or disable the CRD Upgrade Safety validations. Currently, this holds CRDUpgradeSafetyPreflightConfigType
+                      enable or disable the CRD Upgrade Safety validations. Currently, this holds Mode
                       that sets the CRD Upgrade Safety validations to either Enabled/Disabled.
+                      By default, this is set to "Enabled".
                     properties:
-                      crdUpgradeSafetyPreflightConfigType:
+                      mode:
+                        default: Enabled
+                        enum:
+                        - Enabled
+                        - Disabled
                         type: string
                     type: object
                 type: object