Merge pull request #975 from gcs278/OCPBUGS-18248-gatewayclass-delete

OCPBUGS-18248: Prevent GatewayClass from getting recreated
openshift · Sep 26, 2023 · ed6306f · ed6306f
2 parents ee08248 + 806de29
commit ed6306f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkg/operator/controller/gatewayclass/servicemeshcontrolplane.go b/pkg/operator/controller/gatewayclass/servicemeshcontrolplane.go
@@ -63,11 +63,12 @@ func (r *reconciler) ensureServiceMeshControlPlane(ctx context.Context, gatewayc
 // desiredServiceMeshControlPlane returns the desired servicemeshcontrolplane.
 func desiredServiceMeshControlPlane(name types.NamespacedName, ownerRef metav1.OwnerReference) (*maistrav2.ServiceMeshControlPlane, error) {
 	pilotContainerEnv := map[string]string{
-		"PILOT_ENABLE_GATEWAY_API":                       "true",
-		"PILOT_ENABLE_GATEWAY_API_DEPLOYMENT_CONTROLLER": "true",
-		"PILOT_ENABLE_GATEWAY_API_STATUS":                "true",
-		"PILOT_GATEWAY_API_CONTROLLER_NAME":              OpenShiftGatewayClassControllerName,
-		"PILOT_GATEWAY_API_DEFAULT_GATEWAYCLASS":         OpenShiftDefaultGatewayClassName,
+		"PILOT_ENABLE_GATEWAY_API":                         "true",
+		"PILOT_ENABLE_GATEWAY_API_DEPLOYMENT_CONTROLLER":   "true",
+		"PILOT_ENABLE_GATEWAY_API_STATUS":                  "true",
+		"PILOT_GATEWAY_API_CONTROLLER_NAME":                OpenShiftGatewayClassControllerName,
+		"PILOT_GATEWAY_API_DEFAULT_GATEWAYCLASS":           OpenShiftDefaultGatewayClassName,
+		"PILOT_ENABLE_GATEWAY_API_GATEWAYCLASS_CONTROLLER": "false",
 	}
 	f := false
 	t := true