Change operator flags

Azure · Feb 15, 2022 · c8d55c6 · c8d55c6
1 parent 797bf00
commit c8d55c6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/pkg/api/defaults.go b/pkg/api/defaults.go
@@ -51,7 +51,6 @@ const FLAG_FALSE string = "false"
 var DefaultOperatorFlags OperatorFlags = OperatorFlags{
 	"aro.alertwebhook.enabled": FLAG_TRUE,
 
-	"aro.azuresubnets.enabled":                 FLAG_TRUE,
 	"aro.azuresubnets.nsg.enabled":             FLAG_TRUE,
 	"aro.azuresubnets.serviceendpoint.enabled": FLAG_TRUE,
 

diff --git a/pkg/operator/controllers/subnets/subnet_controller_test.go b/pkg/operator/controllers/subnets/subnet_controller_test.go
@@ -42,7 +42,6 @@ func getValidClusterInstance() *arov1alpha1.Cluster {
 			ClusterResourceGroupID: clusterResourceGroupId,
 			InfraID:                infraId,
 			OperatorFlags: arov1alpha1.OperatorFlags{
-				ENABLED:                  "true",
 				NSG_ENABLED:              "true",
 				SERVICE_ENDPOINT_ENABLED: "true",
 			},

diff --git a/pkg/operator/controllers/subnets/subnets_controller.go b/pkg/operator/controllers/subnets/subnets_controller.go
@@ -31,7 +31,6 @@ import (
 
 const (
 	CONFIG_NAMESPACE         string = "aro.azuresubnets"
-	ENABLED                  string = CONFIG_NAMESPACE + ".enabled"
 	NSG_ENABLED              string = CONFIG_NAMESPACE + "nsg.enabled"
 	SERVICE_ENDPOINT_ENABLED string = CONFIG_NAMESPACE + "serviceendpoint.enabled"
 )
@@ -73,7 +72,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(ENABLED) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(NSG_ENABLED) && !instance.Spec.OperatorFlags.GetSimpleBoolean(SERVICE_ENDPOINT_ENABLED) {
 		// controller is disabled
 		return reconcile.Result{}, nil
 	}