convert field CRDUpgradeSafetyPolicy to be an enum (#1159)

Signed-off-by: yashoza19 <[email protected]>

Author: yashoza19

api/v1alpha1/clusterextension_types.go

@@ -28,6 +28,7 @@ var (
 )
 
 type UpgradeConstraintPolicy string
+type CRDUpgradeSafetyPolicy string
 
 const (
 	// The extension will only upgrade if the new version satisfies
@@ -108,14 +109,16 @@ type ServiceAccountReference struct {
 type PreflightConfig struct {
 	//+kubebuilder:Required
 	// CRDUpgradeSafety holds necessary configuration for the CRD Upgrade Safety preflight checks.
-	CRDUpgradeSafety *CRDUpgradeSafetyPreflightConfig `json:"crdUpgradeSafety,omitempty"`
+	CRDUpgradeSafety *CRDUpgradeSafetyPreflightConfig `json:"crdUpgradeSafety"`
 }
 
 // CRDUpgradeSafetyPreflightConfig is the configuration for CRD upgrade safety preflight check.
 type CRDUpgradeSafetyPreflightConfig struct {
 	//+kubebuilder:Required
-	// Disabled represents the state of the CRD upgrade safety preflight check being disabled/enabled.
-	Disabled bool `json:"disabled,omitempty"`
+	//+kubebuilder:validation:Enum:="Enabled";"Disabled"
+	//+kubebuilder:default:=Enabled
+	// policy represents the state of the CRD upgrade safety preflight check. Allowed values are "Enabled", and Disabled".
+	Policy CRDUpgradeSafetyPolicy `json:"policy"`
 }
 
 const (
@@ -145,6 +148,9 @@ const (
 	ReasonUnpackFailed  = "UnpackFailed"
 
 	ReasonErrorGettingReleaseState = "ErrorGettingReleaseState"
+
+	CRDUpgradeSafetyPolicyEnabled  CRDUpgradeSafetyPolicy = "Enabled"
+	CRDUpgradeSafetyPolicyDisabled CRDUpgradeSafetyPolicy = "Disabled"
 )
 
 func init() {

config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml

@@ -115,11 +115,20 @@ spec:
                     description: CRDUpgradeSafety holds necessary configuration for
                       the CRD Upgrade Safety preflight checks.
                     properties:
-                      disabled:
-                        description: Disabled represents the state of the CRD upgrade
-                          safety preflight check being disabled/enabled.
-                        type: boolean
+                      policy:
+                        default: Enabled
+                        description: policy represents the state of the CRD upgrade
+                          safety preflight check. Allowed values are "Enabled", and
+                          Disabled".
+                        enum:
+                        - Enabled
+                        - Disabled
+                        type: string
+                    required:
+                    - policy
                     type: object
+                required:
+                - crdUpgradeSafety
                 type: object
               serviceAccount:
                 description: |-

internal/applier/helm.go

@@ -70,7 +70,7 @@ func (h *Helm) Apply(ctx context.Context, contentFS fs.FS, ext *ocv1alpha1.Clust
 
 	for _, preflight := range h.Preflights {
 		if ext.Spec.Preflight != nil && ext.Spec.Preflight.CRDUpgradeSafety != nil {
-			if _, ok := preflight.(*crdupgradesafety.Preflight); ok && ext.Spec.Preflight.CRDUpgradeSafety.Disabled {
+			if _, ok := preflight.(*crdupgradesafety.Preflight); ok && ext.Spec.Preflight.CRDUpgradeSafety.Policy == ocv1alpha1.CRDUpgradeSafetyPolicyDisabled {
 				// Skip this preflight check because it is of type *crdupgradesafety.Preflight and the CRD Upgrade Safety
 				// preflight check has been disabled
 				continue