OSSM-4627 Add option to disable the GatewayClass controller (maistra#834

)
jewertow · Aug 16, 2023 · 35206ba · 35206ba
1 parent e466ba0
commit 35206ba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/pilot/pkg/config/kube/gateway/controller.go b/pilot/pkg/config/kube/gateway/controller.go
@@ -301,13 +301,15 @@ func (c *Controller) Run(stop <-chan struct{}) {
 	if c.namespaces == nil {
 		return
 	}
-	go func() {
-		if c.waitForCRD(gvk.GatewayClass, stop) {
-			gcc := NewClassController(c.client)
-			c.client.RunAndWait(stop)
-			gcc.Run(stop)
-		}
-	}()
+	if features.EnableGatewayAPIGatewayClassController {
+		go func() {
+			if c.waitForCRD(gvk.GatewayClass, stop) {
+				gcc := NewClassController(c.client)
+				c.client.RunAndWait(stop)
+				gcc.Run(stop)
+			}
+		}()
+	}
 }
 
 func (c *Controller) HasSynced() bool {

diff --git a/pilot/pkg/features/pilot.go b/pilot/pkg/features/pilot.go
@@ -416,6 +416,9 @@ var (
 	EnableGatewayAPIDeploymentController = env.Register("PILOT_ENABLE_GATEWAY_API_DEPLOYMENT_CONTROLLER", true,
 		"If this is set to true, gateway-api resources will automatically provision in cluster deployment, services, etc").Get()
 
+	EnableGatewayAPIGatewayClassController = env.Register("PILOT_ENABLE_GATEWAY_API_GATEWAYCLASS_CONTROLLER", true,
+		"If this is set to true, istiod will ensure that the default GatewayClass always exists").Get()
+
 	ClusterName = env.Register("CLUSTER_ID", "Kubernetes",
 		"Defines the cluster and service registry that this Istiod instance is belongs to").Get()