add omitempty tag to optional fields

Signed-off-by: Rashmi Gottipati <[email protected]>

Author: rashmigottipati

api/v1alpha1/clusterextension_types.go

@@ -319,7 +319,7 @@ type PreflightConfig struct {
 	// consequences of upgrading a CRD, such as data loss.
 	//
 	// This field is required if the spec.preflight field is specified.
-	CRDUpgradeSafety CRDUpgradeSafetyPreflightConfig `json:"crdUpgradeSafety"`
+	CRDUpgradeSafety CRDUpgradeSafetyPreflightConfig `json:"crdUpgradeSafety,omitempty"`
 }
 
 // CRDUpgradeSafetyPreflightConfig is the configuration for CRD upgrade safety preflight check.
@@ -340,7 +340,7 @@ type CRDUpgradeSafetyPreflightConfig struct {
 	//
 	//+kubebuilder:validation:Enum:="Enabled";"Disabled"
 	//+kubebuilder:default:=Enabled
-	Policy CRDUpgradeSafetyPolicy `json:"policy"`
+	Policy CRDUpgradeSafetyPolicy `json:"policy,omitempty"`
 }
 
 const (

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

@@ -253,11 +253,7 @@ spec:
                         - Enabled
                         - Disabled
                         type: string
-                    required:
-                    - policy
                     type: object
-                required:
-                - crdUpgradeSafety
                 type: object
               serviceAccount:
                 description: |-

internal/applier/helm.go

@@ -73,7 +73,6 @@ func (h *Helm) Apply(ctx context.Context, contentFS fs.FS, ext *ocv1alpha1.Clust
 			// Skip this preflight check because it is of type *crdupgradesafety.Preflight and the CRD Upgrade Safety
 			// preflight check has been disabled
 			continue
-
 		}
 		switch state {
 		case StateNeedsInstall: