cbo should be enabled on other platforms to support ZTP

api/v1alpha1/provisioning_validation.go

@@ -26,12 +26,16 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
+type EnabledFeatures struct {
+	ProvisioningNetwork map[ProvisioningNetwork]bool
+}
+
 var (
 	log = ctrl.Log.WithName("provisioning_validation")
 )
 
 // ValidateBaremetalProvisioningConfig validates the contents of the provisioning resource
-func (prov *Provisioning) ValidateBaremetalProvisioningConfig() error {
+func (prov *Provisioning) ValidateBaremetalProvisioningConfig(enabledFeatures EnabledFeatures) error {
 	provisioningNetworkMode := prov.getProvisioningNetworkMode()
 	log.V(1).Info("provisioning network", "mode", provisioningNetworkMode)
 
@@ -57,6 +61,10 @@ func (prov *Provisioning) ValidateBaremetalProvisioningConfig() error {
 
 	var errs []error
 
+	if !enabledFeatures.ProvisioningNetwork[provisioningNetworkMode] {
+		return errors.NewAggregate(append(errs, fmt.Errorf("ProvisioningNetwork %s is not supported", provisioningNetworkMode)))
+	}
+
 	// They all use provisioningOSDownloadURL
 	if err := validateProvisioningOSDownloadURL(prov.Spec.ProvisioningOSDownloadURL); err != nil {
 		errs = append(errs, err...)

api/v1alpha1/provisioning_validation_test.go

@@ -142,7 +142,11 @@ func TestValidateManagedProvisioningConfig(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Logf("Testing tc : %s", tc.name)
 			baremetalCR.Spec = *tc.spec
-			err := baremetalCR.ValidateBaremetalProvisioningConfig()
+			err := baremetalCR.ValidateBaremetalProvisioningConfig(EnabledFeatures{
+				ProvisioningNetwork: map[ProvisioningNetwork]bool{
+					ProvisioningNetworkManaged: true,
+				},
+			})
 			if !tc.expectedError && err != nil {
 				t.Errorf("unexpected errors: %v", err)
 				return
@@ -219,7 +223,11 @@ func TestValidateUnmanagedProvisioningConfig(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Logf("Testing tc : %s", tc.name)
 			baremetalCR.Spec = *tc.spec
-			err := baremetalCR.ValidateBaremetalProvisioningConfig()
+			err := baremetalCR.ValidateBaremetalProvisioningConfig(EnabledFeatures{
+				ProvisioningNetwork: map[ProvisioningNetwork]bool{
+					ProvisioningNetworkUnmanaged: true,
+				},
+			})
 			if !tc.expectedError && err != nil {
 				t.Errorf("unexpected errors: %v", err)
 				return
@@ -308,7 +316,94 @@ func TestValidateDisabledProvisioningConfig(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Logf("Testing tc : %s", tc.name)
 			baremetalCR.Spec = *tc.spec
-			err := baremetalCR.ValidateBaremetalProvisioningConfig()
+			err := baremetalCR.ValidateBaremetalProvisioningConfig(EnabledFeatures{
+				ProvisioningNetwork: map[ProvisioningNetwork]bool{
+					ProvisioningNetworkDisabled: true,
+				},
+			})
+			if !tc.expectedError && err != nil {
+				t.Errorf("unexpected errors: %v", err)
+				return
+			}
+			assert.Equal(t, tc.expectedMode, baremetalCR.getProvisioningNetworkMode(), "enabled results did not match")
+			if tc.expectedError {
+				assert.True(t, strings.Contains(err.Error(), tc.expectedMsg))
+				if !strings.Contains(err.Error(), tc.expectedMsg) {
+					t.Errorf("Non-matching errors: %v", err)
+				}
+			}
+			return
+		})
+	}
+}
+
+func TestValidateSupportedFeatures(t *testing.T) {
+	baremetalCR := &Provisioning{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Provisioning",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: testBaremetalProvisioningCR,
+		},
+	}
+
+	tCases := []struct {
+		name            string
+		spec            *ProvisioningSpec
+		enabledfeatures EnabledFeatures
+		expectedError   bool
+		expectedMode    ProvisioningNetwork
+		expectedMsg     string
+	}{
+		{
+			name:            "managed feature enabled",
+			enabledfeatures: EnabledFeatures{ProvisioningNetwork: map[ProvisioningNetwork]bool{ProvisioningNetworkManaged: true}},
+			spec:            managedProvisioning().build(),
+			expectedError:   false,
+			expectedMode:    ProvisioningNetworkManaged,
+		},
+		{
+			name:            "managed feature disabled",
+			enabledfeatures: EnabledFeatures{ProvisioningNetwork: map[ProvisioningNetwork]bool{}},
+			spec:            managedProvisioning().build(),
+			expectedError:   true,
+			expectedMode:    ProvisioningNetworkManaged,
+		},
+		{
+			name:            "unmanaged feature enabled",
+			enabledfeatures: EnabledFeatures{ProvisioningNetwork: map[ProvisioningNetwork]bool{ProvisioningNetworkUnmanaged: true}},
+			spec:            unmanagedProvisioning().build(),
+			expectedError:   false,
+			expectedMode:    ProvisioningNetworkUnmanaged,
+		},
+		{
+			name:            "managed feature disabled",
+			enabledfeatures: EnabledFeatures{ProvisioningNetwork: map[ProvisioningNetwork]bool{}},
+			spec:            unmanagedProvisioning().build(),
+			expectedError:   true,
+			expectedMode:    ProvisioningNetworkUnmanaged,
+		},
+		{
+			name:            "disabled feature enabled",
+			spec:            disabledProvisioning().build(),
+			enabledfeatures: EnabledFeatures{ProvisioningNetwork: map[ProvisioningNetwork]bool{ProvisioningNetworkDisabled: true}},
+			expectedError:   false,
+			expectedMode:    ProvisioningNetworkDisabled,
+		},
+		{
+			name:            "disabled feature disabled",
+			spec:            disabledProvisioning().build(),
+			enabledfeatures: EnabledFeatures{ProvisioningNetwork: map[ProvisioningNetwork]bool{}},
+			expectedError:   true,
+			expectedMode:    ProvisioningNetworkDisabled,
+		},
+	}
+	for _, tc := range tCases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Logf("Testing tc : %s", tc.name)
+			baremetalCR.Spec = *tc.spec
+			err := baremetalCR.ValidateBaremetalProvisioningConfig(tc.enabledfeatures)
 			if !tc.expectedError && err != nil {
 				t.Errorf("unexpected errors: %v", err)
 				return

api/v1alpha1/provisioning_webhook.go

@@ -26,8 +26,10 @@ import (
 
 // log is for logging in this package.
 var provisioninglog = logf.Log.WithName("provisioning-resource")
+var enabledFeatures EnabledFeatures
 
-func (r *Provisioning) SetupWebhookWithManager(mgr ctrl.Manager) error {
+func (r *Provisioning) SetupWebhookWithManager(mgr ctrl.Manager, features EnabledFeatures) error {
+	enabledFeatures = features
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(r).
 		Complete()
@@ -44,13 +46,13 @@ func (r *Provisioning) ValidateCreate() error {
 		return fmt.Errorf("Provisioning object is a singleton and must be named \"%s\"", ProvisioningSingletonName)
 	}
 
-	return r.ValidateBaremetalProvisioningConfig()
+	return r.ValidateBaremetalProvisioningConfig(enabledFeatures)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
 func (r *Provisioning) ValidateUpdate(old runtime.Object) error {
 	provisioninglog.Info("validate update", "name", r.Name)
-	return r.ValidateBaremetalProvisioningConfig()
+	return r.ValidateBaremetalProvisioningConfig(enabledFeatures)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type

api/v1alpha1/provisioning_webhook_test.go

@@ -48,6 +48,14 @@ func TestProvisioningValidateCreate(t *testing.T) {
 			wantErr: "Provisioning object is a singleton and must be named \"provisioning-configuration\"",
 		},
 	}
+	enabledFeatures = EnabledFeatures{
+		ProvisioningNetwork: map[ProvisioningNetwork]bool{
+			ProvisioningNetworkDisabled:  true,
+			ProvisioningNetworkUnmanaged: true,
+			ProvisioningNetworkManaged:   true,
+		},
+	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			tt.p.Spec = *disabledProvisioning().build()