fix cluster scoped istio CR (Kuadrant#391)

Co-authored-by: Adam Cattermole <[email protected]>
adam-cattermole · Jan 30, 2024 · 6f029d1 · 6f029d1
1 parent 08aba7e
commit 6f029d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config/dependencies/istio/sail/istio.yaml b/config/dependencies/istio/sail/istio.yaml
@@ -1,8 +1,7 @@
 apiVersion: operator.istio.io/v1alpha1
 kind: Istio
 metadata:
-  name: istiocontrolplane
-  namespace: istio-system
+  name: default
 spec:
   version: v1.20.0
   namespace: istio-system

diff --git a/controllers/kuadrant_controller.go b/controllers/kuadrant_controller.go
@@ -50,6 +50,8 @@ import (
 
 const (
 	kuadrantFinalizer = "kuadrant.io/finalizer"
+	// (Sail) The istio CR must be named default to process GW API resources
+	istioCRName = "default"
 )
 
 // KuadrantReconciler reconciles a Kuadrant object
@@ -332,6 +334,7 @@ func (r *KuadrantReconciler) getIstioConfigObjects(ctx context.Context, logger l
 	} else {
 		// Error is NoMatchError so check for Istio CR instead
 		ist := &istiov1alpha1.Istio{}
+		istKey := client.ObjectKey{Name: istioCRName}
 		if err := r.GetResource(ctx, istKey, ist); err != nil {
 			logger.V(1).Info("failed to get istio object", "key", istKey, "err", err)
 			if apimeta.IsNoMatchError(err) {