Use istio/envoy-gateway for provider namespace

Signed-off-by: Adam Cattermole <[email protected]>

.github/workflows/verify-dashboards-alerts.yaml

@@ -32,7 +32,7 @@ jobs:
           kind create cluster
           # Install Istio
           kubectl apply -k config/dependencies/istio/sail
-          kubectl -n gateway-system wait --for=condition=Available deployment istio-operator --timeout=300s
+          kubectl -n istio-system wait --for=condition=Available deployment istio-operator --timeout=300s
           kubectl apply -f config/dependencies/istio/sail/istio.yaml
 
           # Install Observability Stack (Grafana and Prometheus)

config/dependencies/envoy-gateway/gateway/kustomization.yaml

@@ -2,5 +2,6 @@
 # Adds namespace to all resources.
 namespace: gateway-system
 resources:
+- namespace.yaml
 - gateway-class.yaml
 - gateway.yaml

config/dependencies/envoy-gateway/gateway/namespace.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: gateway-system

config/dependencies/istio/gateway/kustomization.yaml

@@ -2,4 +2,5 @@
 # Adds namespace to all resources.
 namespace: gateway-system
 resources:
+- namespace.yaml
 - gateway.yaml

config/dependencies/istio/gateway/namespace.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: gateway-system

config/dependencies/istio/istio-operator.yaml

@@ -2,11 +2,11 @@
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 metadata:
-  namespace: gateway-system
+  namespace: istio-system
   name: istiocontrolplane
 spec:
   profile: default
-  namespace: gateway-system
+  namespace: istio-system
   components:
     base:
       enabled: true
@@ -28,4 +28,4 @@ spec:
     pilot:
       autoscaleEnabled: false
     global:
-      istioNamespace: gateway-system
+      istioNamespace: istio-system

config/dependencies/istio/sail/istio.yaml

@@ -4,12 +4,12 @@ metadata:
   name: default
 spec:
   version: v1.20.0
-  namespace: gateway-system
+  namespace: istio-system
   # Disable autoscaling to reduce dev resources
   values:
     pilot:
       autoscaleEnabled: false
   rawValues:
     gateways:
-      kuadrant-ingressgateway:
+      istio-ingressgateway:
         autoscaleEnabled: false

config/dependencies/istio/sail/kustomization.yaml

@@ -1,5 +1,5 @@
 ---
-namespace: gateway-system
+namespace: istio-system
 resources:
 - github.com/maistra/istio-operator/config/default?ref=b7f5286be0bc25cb257bc439e7c18acb99dce26f
 # commit sha from prior to removal of kustomize manifests

controllers/kuadrant_controller.go

@@ -58,7 +58,7 @@ func controlPlaneConfigMapName() string {
 }
 
 func controlPlaneProviderNamespace() string {
-	return env.GetString("ISTIOOPERATOR_NAMESPACE", "gateway-system")
+	return env.GetString("ISTIOOPERATOR_NAMESPACE", "istio-system")
 }
 
 func controlPlaneProviderName() string {

hack/quickstart-setup.sh

@@ -402,15 +402,15 @@ info "Installing Istio as a Gateway API provider... 🛫"
 if [ "$ISTIO_INSTALL_SAIL" = true ]; then
   info "Installing Istio via Sail"
   kubectl apply -k ${KUADRANT_ISTIO_KUSTOMIZATION}
-  kubectl -n gateway-system wait --for=condition=Available deployment istio-operator --timeout=300s
+  kubectl -n istio-system wait --for=condition=Available deployment istio-operator --timeout=300s
   kubectl apply -f ${KUADRANT_REPO_RAW}/config/dependencies/istio/sail/istio.yaml
 else
   # Create CRD first to prevent race condition with creating CR
   info "Generating Istio configuration... 🛠️"
   kubectl kustomize ${MGC_ISTIO_KUSTOMIZATION} >${TMP_DIR}/doctmp
   success "Istio configuration generated."
   ${YQ_BIN} 'select(.kind == "CustomResourceDefinition")' ${TMP_DIR}/doctmp | kubectl apply -f -
-  kubectl -n gateway-system wait --for=condition=established crd/istiooperators.install.istio.io --timeout=60s
+  kubectl -n istio-system wait --for=condition=established crd/istiooperators.install.istio.io --timeout=60s
   cat ${TMP_DIR}/doctmp | kubectl apply -f -
   kubectl -n istio-operator wait --for=condition=Available deployment istio-operator --timeout=300s
 fi

make/development-environments.mk

@@ -109,12 +109,12 @@ istio-env-setup: ## Install Istio, istio gateway and gatewayapi-env-setup
 	$(MAKE) deploy-istio-gateway
 	@echo
 	@echo "Now you can open local access to the istio gateway by doing:"
-	@echo "kubectl port-forward -n $(ISTIO_NAMESPACE) service/kuadrant-ingressgateway-istio 9080:80 &"
+	@echo "kubectl port-forward -n gateway-system service/kuadrant-ingressgateway-istio 9080:80 &"
 	@echo "export GATEWAY_URL=localhost:9080"
 	@echo "after that, you can curl -H \"Host: myhost.com\" \$$GATEWAY_URL"
 	@echo "-- Linux only -- Ingress gateway is exported using loadbalancer service in port 80"
-	@echo "export INGRESS_HOST=\$$(kubectl get gtw kuadrant-ingressgateway -n $(ISTIO_NAMESPACE) -o jsonpath='{.status.addresses[0].value}')"
-	@echo "export INGRESS_PORT=\$$(kubectl get gtw kuadrant-ingressgateway -n $(ISTIO_NAMESPACE) -o jsonpath='{.spec.listeners[?(@.name==\"http\")].port}')"
+	@echo "export INGRESS_HOST=\$$(kubectl get gtw kuadrant-ingressgateway -n gateway-system -o jsonpath='{.status.addresses[0].value}')"
+	@echo "export INGRESS_PORT=\$$(kubectl get gtw kuadrant-ingressgateway -n gateway-system -o jsonpath='{.spec.listeners[?(@.name==\"http\")].port}')"
 	@echo "export GATEWAY_URL=\$$INGRESS_HOST:\$$INGRESS_PORT"
 	@echo "curl -H \"Host: myhost.com\" \$$GATEWAY_URL"
 	@echo

make/envoy-gateway.mk

@@ -4,7 +4,7 @@
 ## Targets to help install and configure EG
 
 EG_CONFIG_DIR = config/dependencies/envoy-gateway
-EG_NAMESPACE = gateway-system
+EG_NAMESPACE = envoy-gateway-system
 
 # egctl tool
 EGCTL=$(PROJECT_PATH)/bin/egctl

make/istio.mk

@@ -4,7 +4,7 @@
 ## Targets to help install and configure istio
 
 ISTIO_INSTALL_DIR = config/dependencies/istio
-ISTIO_NAMESPACE = gateway-system
+ISTIO_NAMESPACE = istio-system
 ## installs project sail vs istioctl install
 ISTIO_INSTALL_SAIL ?= false
 ifeq (true,$(ISTIO_INSTALL_SAIL))