Make disableCopiedCSVs a boolean

Author: awgreene

crds/operators.coreos.com_olmconfigs.yaml

@@ -43,6 +43,7 @@ spec:
                     disableCopiedCSVs:
                       description: DisableCopiedCSVs is used to disable OLM's "Copied CSV" feature for operators installed at the cluster scope, where a cluster scoped operator is one that has been installed in an OperatorGroup that targets all namespaces. When reenabled, OLM will recreate the "Copied CSVs" for each cluster scoped operator.
                       type: boolean
+                      default: false
             status:
               description: OLMConfigStatus is the status for an OLMConfig resource.
               type: object

crds/zz_defs.go

@@ -19,33 +19,33 @@ func TestCopiedCSVsAreEnabled(t *testing.T) {
 		{
 			description: "NilConfig",
 			olmConfig:   nil,
-			expected:    false,
+			expected:    true,
 		},
 		{
 			description: "MissingSpec",
 			olmConfig:   &OLMConfig{},
-			expected:    false,
+			expected:    true,
 		},
 		{
 			description: "MissingFeatures",
 			olmConfig: &OLMConfig{
 				Spec: OLMConfigSpec{},
 			},
-			expected: false,
+			expected: true,
 		},
 		{
 			description: "MissingDisableCopiedCSVs",
 			olmConfig: &OLMConfig{
 				Spec: OLMConfigSpec{},
 			},
-			expected: false,
+			expected: true,
 		},
 		{
 			description: "CopiedCSVsDisabled",
 			olmConfig: &OLMConfig{
 				Spec: OLMConfigSpec{
 					Features: Features{
-						DisableCopiedCSVs: boolPointer(true),
+						DisableCopiedCSVs: true,
 					},
 				},
 			},
@@ -56,7 +56,7 @@ func TestCopiedCSVsAreEnabled(t *testing.T) {
 			olmConfig: &OLMConfig{
 				Spec: OLMConfigSpec{
 					Features: Features{
-						DisableCopiedCSVs: boolPointer(false),
+						DisableCopiedCSVs: false,
 					},
 				},
 			},

pkg/operators/v1/olmconfig_test.go

@@ -11,14 +11,15 @@ type OLMConfigSpec struct {
 
 // Features contains the list of configurable OLM features.
 type Features struct {
+	// +kubebuilder:default=false
 
 	// DisableCopiedCSVs is used to disable OLM's "Copied CSV" feature
 	// for operators installed at the cluster scope, where a cluster
 	// scoped operator is one that has been installed in an
 	// OperatorGroup that targets all namespaces.
 	// When reenabled, OLM will recreate the "Copied CSVs" for each
 	// cluster scoped operator.
-	DisableCopiedCSVs *bool `json:"disableCopiedCSVs,omitempty"`
+	DisableCopiedCSVs bool `json:"disableCopiedCSVs,omitempty"`
 }
 
 // OLMConfigStatus is the status for an OLMConfig resource.
@@ -61,10 +62,5 @@ func (config *OLMConfig) CopiedCSVsAreEnabled() bool {
 		return true
 	}
 
-	disableCopiedCSVs := config.Spec.Features.DisableCopiedCSVs
-	if disableCopiedCSVs != nil {
-		return !*disableCopiedCSVs
-	}
-
-	return true
+	return !config.Spec.Features.DisableCopiedCSVs
 }