From 4e540bf48830f5b864f6ccb564e45c4ef92ac597 Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Tue, 2 Apr 2024 11:46:17 +0800
Subject: [PATCH 1/8] Adding Tetrate Istio Distribution

---
 .../Addons/Partner/Tetrate.io/namespace.yaml  |   8 +
 .../Tetrate.io/tetrate-istiod-source.yaml     |   8 +
 .../Partner/Tetrate.io/tetrate-istiod.yaml    |  16 ++
 .../tetrate-istiod-testjob-script.yaml        | 143 ++++++++++++++++++
 .../Tetrate.io/tetrate-istiod-testjob.yaml    |  28 ++++
 .../Tetrate.io/tetrate-testjob-role.yaml      |  29 ++++
 6 files changed, 232 insertions(+)
 create mode 100644 eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
 create mode 100644 eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
 create mode 100644 eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
 create mode 100644 eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
 create mode 100644 eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
 create mode 100644 eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml

diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
new file mode 100644
index 00000000..72f0c774
--- /dev/null
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: istio-system
+  labels:
+    aws.conformance.vendor: tetrate.io
+    aws.conformance.vendor-solution: tetrate-istio-distribution
+    aws.conformance.vendor-solution-version: 1.18.1
diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
new file mode 100644
index 00000000..f998e18c
--- /dev/null
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: tetrate-istio-charts
+  namespace: flux-system
+spec:
+  interval: 30s
+  url: https://tetratelabs.github.io/helm-charts
diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
new file mode 100644
index 00000000..7c0494aa
--- /dev/null
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
@@ -0,0 +1,16 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: tetrate-istiod
+  namespace: istio-system
+spec:
+  chart:
+    spec:
+      chart: istiod
+      reconcileStrategy: ChartVersion
+      sourceRef:
+        kind: HelmRepository
+        name: tetrate-istio-charts
+        namespace: flux-system
+      version: 1.18.1
+  interval: 1m0s
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
new file mode 100644
index 00000000..5ca166db
--- /dev/null
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
@@ -0,0 +1,143 @@
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: tetrate-tetsjob-script
+  namespace: istio-system
+data:
+  run-functional-tests.sh: |-
+    #!/bin/sh
+
+    # Cleanup function to remove resources
+    cleanup() {
+        echo "Cleaning up resources..."
+        kubectl delete gateway httpbin-gateway -n istio-system
+        kubectl delete deployment custom-ingressgateway -n istio-system
+        # Any additional cleanup commands go here
+        echo "Cleanup completed."
+    }
+
+    # Trap statement to ensure cleanup runs on exit of the script
+    trap cleanup EXIT
+
+
+    error_exit()
+    {
+        echo "Test Failed: $1" 1>&2
+        exit 1
+    }
+    
+    deploy_custom_gateway() {
+        # Create a custom Istio ingress gateway
+        cat <<EOF | kubectl apply -f -
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      name: custom-ingressgateway
+      namespace: istio-system
+    spec:
+      replicas: 1
+      selector:
+        matchLabels:
+          istio: custom-ingress-gw
+      template:
+        metadata:
+          annotations:
+            inject.istio.io/templates: gateway
+          labels:
+            istio: custom-ingress-gw
+            sidecar.istio.io/inject: "true"
+        spec:
+          containers:
+          - name: istio-proxy
+            image: auto # Make sure to replace this with the actual image you want to use.
+    EOF
+    
+        # Verify the custom gateway has been deployed
+        kubectl get deployment custom-ingressgateway -n istio-system
+    }
+    
+    deploy_test_gateway() {
+        # Create a Gateway resource
+        cat <<EOF | kubectl apply -f -
+    apiVersion: networking.istio.io/v1alpha3
+    kind: Gateway
+    metadata:
+      name: httpbin-gateway
+      namespace: istio-system
+    spec:
+      selector:
+        istio: custom-ingress-gw # this should match the label of your Istio ingress gateway deployment
+      servers:
+      - port:
+          number: 80
+          name: http
+          protocol: HTTP
+        hosts:
+        - "httpbin.example.com"
+    EOF
+    
+        # Verify the Gateway has been created
+        kubectl get gateway httpbin-gateway -n istio-system
+    }
+    
+    deploy_test_virtualservice() {
+        # Create a VirtualService resource
+        cat <<EOF | kubectl apply -f -
+    apiVersion: networking.istio.io/v1alpha3
+    kind: VirtualService
+    metadata:
+      name: httpbin-virtualservice
+      namespace: istio-system
+    spec:
+      hosts:
+      - "httpbin.example.com"
+      gateways:
+      - httpbin-gateway
+      http:
+      - match:
+        - uri:
+            prefix: "/"
+        route:
+        - destination:
+            host: httpbin
+            port:
+              number: 80
+    EOF
+    
+        # Verify the VirtualService has been created
+        kubectl get virtualservice httpbin-virtualservice -n istio-system
+    }
+    
+    check_istio_gateway_config() {
+       # Get the name of the Istio ingressgateway pod
+       local ingress_gateway_pod=$(kubectl get pod -l istio=custom-ingress-gw -n istio-system -o jsonpath='{.items[0].metadata.name}')
+       
+       # Check if the ingress gateway has received configuration from Istiod
+       local gateway_status=$(kubectl exec "$ingress_gateway_pod" -n istio-system -- curl -s 'http://localhost:15000/config_dump')
+       
+       if echo "$gateway_status" | grep 'httpbin.example.com'; then
+           echo "Istio Ingress Gateway has received correct configuration from Istiod."
+       else
+           error_exit "Istio Ingress Gateway has not received correct configuration from Istiod."
+       fi
+    }
+    
+    echo "Deploying custom Istio Ingress Gateway..."
+    deploy_custom_gateway || error_exit "Failed to deploy custom Istio Ingress Gateway."
+
+    # Wait for the custom ingress gateway deployment to be ready
+    echo "Waiting for the custom ingress gateway deployment to be ready..."
+    kubectl rollout status deployment/custom-ingressgateway -n istio-system || error_exit "Custom Istio Ingress Gateway deployment is not ready."
+
+    echo "Deploying test gateway..."
+    deploy_test_gateway || error_exit "Failed to deploy test gateway."
+    
+    echo "Deploying test VirtualService..."
+    deploy_test_virtualservice || error_exit "Failed to deploy test VirtualService."
+    
+    echo "Checking Istio Ingress Gateway configuration..."
+    check_istio_gateway_config || error_exit "Ingress Gateway configuration check failed."
+    
+    echo "Istio functional test completed successfully."
+    exit 0
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
new file mode 100644
index 00000000..ccad87f3
--- /dev/null
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
@@ -0,0 +1,28 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: tetrate-istiod-health-test
+  namespace: istio-system  
+spec:
+  schedule: "10 10 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+            - name: tetrate-istiod-healthtest
+              image: 'alpine/k8s:1.26.2'
+              imagePullPolicy: Always
+              command:
+                - /bin/run-functional-tests.sh
+              volumeMounts:
+                - name: functional-tests-volume
+                  mountPath: /bin/run-functional-tests.sh
+                  readOnly: true
+                  subPath: run-functional-tests.sh
+          volumes:
+            - name: functional-tests-volume
+              configMap:
+                defaultMode: 0700
+                name: tetrate-tetsjob-script
+          restartPolicy: Never
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml
new file mode 100644
index 00000000..a6213c51
--- /dev/null
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml
@@ -0,0 +1,29 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: tetrate-istiod-job-role
+  namespace: istio-system
+rules:
+  - apiGroups: [""]
+    resources: ["pods", "pods/exec", "services"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+  - apiGroups: ["apps"]
+    resources: ["deployments"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+  - apiGroups: ["networking.istio.io"]
+    resources: ["gateways", "virtualservices", "destinationrules", "serviceentries", "envoyfilters"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: tetrate-istiod-job-rolebinding
+  namespace: istio-system
+subjects:
+  - kind: ServiceAccount
+    name: default
+    namespace: istio-system
+roleRef:
+  kind: Role
+  name: tetrate-istiod-job-role
+  apiGroup: rbac.authorization.k8s.io

From 631c439b420f11f7c475389da0d1ea2859b59a74 Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Sun, 7 Apr 2024 13:19:33 +0800
Subject: [PATCH 2/8] use namespace tetrate-istio

Signed-off-by: zirain <zirain2009@gmail.com>
---
 .../Addons/Partner/Tetrate.io/namespace.yaml  |  2 +-
 .../Partner/Tetrate.io/tetrate-istiod.yaml    |  2 +-
 .../tetrate-istiod-testjob-script.yaml        | 24 +++++++++----------
 .../Tetrate.io/tetrate-istiod-testjob.yaml    |  2 +-
 .../Tetrate.io/tetrate-testjob-role.yaml      |  6 ++---
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
index 72f0c774..fcb8760e 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: istio-system
+  name: tetrate-istio
   labels:
     aws.conformance.vendor: tetrate.io
     aws.conformance.vendor-solution: tetrate-istio-distribution
diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
index 7c0494aa..c4901a1b 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
@@ -2,7 +2,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: tetrate-istiod
-  namespace: istio-system
+  namespace: tetrate-istio
 spec:
   chart:
     spec:
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
index 5ca166db..b644a4dc 100644
--- a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: tetrate-tetsjob-script
-  namespace: istio-system
+  namespace: tetrate-istio
 data:
   run-functional-tests.sh: |-
     #!/bin/sh
@@ -11,8 +11,8 @@ data:
     # Cleanup function to remove resources
     cleanup() {
         echo "Cleaning up resources..."
-        kubectl delete gateway httpbin-gateway -n istio-system
-        kubectl delete deployment custom-ingressgateway -n istio-system
+        kubectl delete gateway httpbin-gateway -n tetrate-istio
+        kubectl delete deployment custom-ingressgateway -n tetrate-istio
         # Any additional cleanup commands go here
         echo "Cleanup completed."
     }
@@ -34,7 +34,7 @@ data:
     kind: Deployment
     metadata:
       name: custom-ingressgateway
-      namespace: istio-system
+      namespace: tetrate-istio
     spec:
       replicas: 1
       selector:
@@ -54,7 +54,7 @@ data:
     EOF
     
         # Verify the custom gateway has been deployed
-        kubectl get deployment custom-ingressgateway -n istio-system
+        kubectl get deployment custom-ingressgateway -n tetrate-istio
     }
     
     deploy_test_gateway() {
@@ -64,7 +64,7 @@ data:
     kind: Gateway
     metadata:
       name: httpbin-gateway
-      namespace: istio-system
+      namespace: tetrate-istio
     spec:
       selector:
         istio: custom-ingress-gw # this should match the label of your Istio ingress gateway deployment
@@ -78,7 +78,7 @@ data:
     EOF
     
         # Verify the Gateway has been created
-        kubectl get gateway httpbin-gateway -n istio-system
+        kubectl get gateway httpbin-gateway -n tetrate-istio
     }
     
     deploy_test_virtualservice() {
@@ -88,7 +88,7 @@ data:
     kind: VirtualService
     metadata:
       name: httpbin-virtualservice
-      namespace: istio-system
+      namespace: tetrate-istio
     spec:
       hosts:
       - "httpbin.example.com"
@@ -106,15 +106,15 @@ data:
     EOF
     
         # Verify the VirtualService has been created
-        kubectl get virtualservice httpbin-virtualservice -n istio-system
+        kubectl get virtualservice httpbin-virtualservice -n tetrate-istio
     }
     
     check_istio_gateway_config() {
        # Get the name of the Istio ingressgateway pod
-       local ingress_gateway_pod=$(kubectl get pod -l istio=custom-ingress-gw -n istio-system -o jsonpath='{.items[0].metadata.name}')
+       local ingress_gateway_pod=$(kubectl get pod -l istio=custom-ingress-gw -n tetrate-istio -o jsonpath='{.items[0].metadata.name}')
        
        # Check if the ingress gateway has received configuration from Istiod
-       local gateway_status=$(kubectl exec "$ingress_gateway_pod" -n istio-system -- curl -s 'http://localhost:15000/config_dump')
+       local gateway_status=$(kubectl exec "$ingress_gateway_pod" -n tetrate-istio -- curl -s 'http://localhost:15000/config_dump')
        
        if echo "$gateway_status" | grep 'httpbin.example.com'; then
            echo "Istio Ingress Gateway has received correct configuration from Istiod."
@@ -128,7 +128,7 @@ data:
 
     # Wait for the custom ingress gateway deployment to be ready
     echo "Waiting for the custom ingress gateway deployment to be ready..."
-    kubectl rollout status deployment/custom-ingressgateway -n istio-system || error_exit "Custom Istio Ingress Gateway deployment is not ready."
+    kubectl rollout status deployment/custom-ingressgateway -n tetrate-istio || error_exit "Custom Istio Ingress Gateway deployment is not ready."
 
     echo "Deploying test gateway..."
     deploy_test_gateway || error_exit "Failed to deploy test gateway."
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
index ccad87f3..6339fd43 100644
--- a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
@@ -2,7 +2,7 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: tetrate-istiod-health-test
-  namespace: istio-system  
+  namespace: tetrate-istio  
 spec:
   schedule: "10 10 * * *"
   jobTemplate:
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml
index a6213c51..64aadab5 100644
--- a/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: tetrate-istiod-job-role
-  namespace: istio-system
+  namespace: tetrate-istio
 rules:
   - apiGroups: [""]
     resources: ["pods", "pods/exec", "services"]
@@ -18,11 +18,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: tetrate-istiod-job-rolebinding
-  namespace: istio-system
+  namespace: tetrate-istio
 subjects:
   - kind: ServiceAccount
     name: default
-    namespace: istio-system
+    namespace: tetrate-istio
 roleRef:
   kind: Role
   name: tetrate-istiod-job-role

From 96155c230d5fbf928e8aa98236fcd1b2c8a159ca Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Tue, 9 Apr 2024 09:09:03 +0800
Subject: [PATCH 3/8] rename to tetrate-istio-system

---
 .../Addons/Partner/Tetrate.io/namespace.yaml  |  2 +-
 .../Partner/Tetrate.io/tetrate-istiod.yaml    |  2 +-
 .../tetrate-istiod-testjob-script.yaml        | 24 +++++++++----------
 .../Tetrate.io/tetrate-istiod-testjob.yaml    |  2 +-
 .../Tetrate.io/tetrate-testjob-role.yaml      | 12 +++++-----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
index fcb8760e..b1072d94 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: tetrate-istio
+  name: tetrate-istio-system
   labels:
     aws.conformance.vendor: tetrate.io
     aws.conformance.vendor-solution: tetrate-istio-distribution
diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
index c4901a1b..db0d8369 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
@@ -2,7 +2,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: tetrate-istiod
-  namespace: tetrate-istio
+  namespace: tetrate-istio-system
 spec:
   chart:
     spec:
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
index b644a4dc..cfff5fad 100644
--- a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob-script.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: tetrate-tetsjob-script
-  namespace: tetrate-istio
+  namespace: tetrate-istio-system
 data:
   run-functional-tests.sh: |-
     #!/bin/sh
@@ -11,8 +11,8 @@ data:
     # Cleanup function to remove resources
     cleanup() {
         echo "Cleaning up resources..."
-        kubectl delete gateway httpbin-gateway -n tetrate-istio
-        kubectl delete deployment custom-ingressgateway -n tetrate-istio
+        kubectl delete gateway httpbin-gateway -n tetrate-istio-system
+        kubectl delete deployment custom-ingressgateway -n tetrate-istio-system
         # Any additional cleanup commands go here
         echo "Cleanup completed."
     }
@@ -34,7 +34,7 @@ data:
     kind: Deployment
     metadata:
       name: custom-ingressgateway
-      namespace: tetrate-istio
+      namespace: tetrate-istio-system
     spec:
       replicas: 1
       selector:
@@ -54,7 +54,7 @@ data:
     EOF
     
         # Verify the custom gateway has been deployed
-        kubectl get deployment custom-ingressgateway -n tetrate-istio
+        kubectl get deployment custom-ingressgateway -n tetrate-istio-system
     }
     
     deploy_test_gateway() {
@@ -64,7 +64,7 @@ data:
     kind: Gateway
     metadata:
       name: httpbin-gateway
-      namespace: tetrate-istio
+      namespace: tetrate-istio-system
     spec:
       selector:
         istio: custom-ingress-gw # this should match the label of your Istio ingress gateway deployment
@@ -78,7 +78,7 @@ data:
     EOF
     
         # Verify the Gateway has been created
-        kubectl get gateway httpbin-gateway -n tetrate-istio
+        kubectl get gateway httpbin-gateway -n tetrate-istio-system
     }
     
     deploy_test_virtualservice() {
@@ -88,7 +88,7 @@ data:
     kind: VirtualService
     metadata:
       name: httpbin-virtualservice
-      namespace: tetrate-istio
+      namespace: tetrate-istio-system
     spec:
       hosts:
       - "httpbin.example.com"
@@ -106,15 +106,15 @@ data:
     EOF
     
         # Verify the VirtualService has been created
-        kubectl get virtualservice httpbin-virtualservice -n tetrate-istio
+        kubectl get virtualservice httpbin-virtualservice -n tetrate-istio-system
     }
     
     check_istio_gateway_config() {
        # Get the name of the Istio ingressgateway pod
-       local ingress_gateway_pod=$(kubectl get pod -l istio=custom-ingress-gw -n tetrate-istio -o jsonpath='{.items[0].metadata.name}')
+       local ingress_gateway_pod=$(kubectl get pod -l istio=custom-ingress-gw -n tetrate-istio-system -o jsonpath='{.items[0].metadata.name}')
        
        # Check if the ingress gateway has received configuration from Istiod
-       local gateway_status=$(kubectl exec "$ingress_gateway_pod" -n tetrate-istio -- curl -s 'http://localhost:15000/config_dump')
+       local gateway_status=$(kubectl exec "$ingress_gateway_pod" -n tetrate-istio-system -- curl -s 'http://localhost:15000/config_dump')
        
        if echo "$gateway_status" | grep 'httpbin.example.com'; then
            echo "Istio Ingress Gateway has received correct configuration from Istiod."
@@ -128,7 +128,7 @@ data:
 
     # Wait for the custom ingress gateway deployment to be ready
     echo "Waiting for the custom ingress gateway deployment to be ready..."
-    kubectl rollout status deployment/custom-ingressgateway -n tetrate-istio || error_exit "Custom Istio Ingress Gateway deployment is not ready."
+    kubectl rollout status deployment/custom-ingressgateway -n tetrate-istio-system || error_exit "Custom Istio Ingress Gateway deployment is not ready."
 
     echo "Deploying test gateway..."
     deploy_test_gateway || error_exit "Failed to deploy test gateway."
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
index 6339fd43..89a57432 100644
--- a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
@@ -2,7 +2,7 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: tetrate-istiod-health-test
-  namespace: tetrate-istio  
+  namespace: tetrate-istio-system
 spec:
   schedule: "10 10 * * *"
   jobTemplate:
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml
index 64aadab5..65a4342d 100644
--- a/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-testjob-role.yaml
@@ -1,8 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: tetrate-istiod-job-role
-  namespace: tetrate-istio
+  name: tetrate-istio-systemd-job-role
+  namespace: tetrate-istio-system
 rules:
   - apiGroups: [""]
     resources: ["pods", "pods/exec", "services"]
@@ -17,13 +17,13 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: tetrate-istiod-job-rolebinding
-  namespace: tetrate-istio
+  name: tetrate-istio-systemd-job-rolebinding
+  namespace: tetrate-istio-system
 subjects:
   - kind: ServiceAccount
     name: default
-    namespace: tetrate-istio
+    namespace: tetrate-istio-system
 roleRef:
   kind: Role
-  name: tetrate-istiod-job-role
+  name: tetrate-istio-systemd-job-role
   apiGroup: rbac.authorization.k8s.io

From 1181bf0f118314a988627d26e5bbbc66604e5aae Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Mon, 15 Apr 2024 15:37:06 +0800
Subject: [PATCH 4/8] update chart name

---
 .../Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml        | 1 +
 .../Addons/Partner/Tetrate.io/tetrate-istiod.yaml               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
index f998e18c..d076d882 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
@@ -5,4 +5,5 @@ metadata:
   namespace: flux-system
 spec:
   interval: 30s
+  timeout: 60s
   url: https://tetratelabs.github.io/helm-charts
diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
index db0d8369..a40513a9 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   chart:
     spec:
-      chart: istiod
+      chart: tetrate-istioit
       reconcileStrategy: ChartVersion
       sourceRef:
         kind: HelmRepository

From cc00a6f298cd0d57f0b2af04e8eb3154db16f2d1 Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Mon, 15 Apr 2024 17:01:27 +0800
Subject: [PATCH 5/8] nit

---
 .../Addons/Partner/Tetrate.io/tetrate-istiod.yaml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
index a40513a9..dd4d41c0 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   chart:
     spec:
-      chart: tetrate-istioit
+      chart: tetrate-istio
       reconcileStrategy: ChartVersion
       sourceRef:
         kind: HelmRepository

From aef1e4b3cc5878318b6904f43fff10de372a6812 Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Tue, 16 Apr 2024 14:25:17 +0800
Subject: [PATCH 6/8] more fix

---
 .../Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml       | 2 +-
 .../Addons/Partner/Tetrate.io/tetrate-istiod.yaml              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
index d076d882..c91198c6 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod-source.yaml
@@ -6,4 +6,4 @@ metadata:
 spec:
   interval: 30s
   timeout: 60s
-  url: https://tetratelabs.github.io/helm-charts
+  url: https://tetratelabs.github.io/istio-helm
diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
index dd4d41c0..8ec4975d 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
@@ -13,4 +13,7 @@ spec:
         name: tetrate-istio-charts
         namespace: flux-system
       version: 1.18.1
+  values:
+    global:
+      istioNamespace: tetrate-istio-system
   interval: 1m0s

From 9ccaafa3ed45b7139b12f1c208c222ab919752c8 Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Wed, 17 Apr 2024 21:24:25 +0800
Subject: [PATCH 7/8] use revision

---
 eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml | 1 +
 .../Addons/Partner/Tetrate.io/tetrate-istiod.yaml            | 5 +++++
 .../Testers/Tetrate.io/tetrate-istiod-testjob.yaml           | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
index b1072d94..56f7d8db 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   name: tetrate-istio-system
   labels:
+    istio.io/rev: 1-18-1
     aws.conformance.vendor: tetrate.io
     aws.conformance.vendor-solution: tetrate-istio-distribution
     aws.conformance.vendor-solution-version: 1.18.1
diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
index 8ec4975d..f78a4ae1 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
@@ -14,6 +14,11 @@ spec:
         namespace: flux-system
       version: 1.18.1
   values:
+    tid-base:
+      defaultRevision: ""
+    revision: 1-18-1
+    tid-cni:
+      revision: 1-18-1
     global:
       istioNamespace: tetrate-istio-system
   interval: 1m0s
diff --git a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
index 89a57432..7d1ba0f2 100644
--- a/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
+++ b/eks-anywhere-common/Testers/Tetrate.io/tetrate-istiod-testjob.yaml
@@ -8,10 +8,13 @@ spec:
   jobTemplate:
     spec:
       template:
+        metadata:
+          labels:
+            sidecar.istio.io/inject: "false"
         spec:
           containers:
             - name: tetrate-istiod-healthtest
-              image: 'alpine/k8s:1.26.2'
+              image: "alpine/k8s:1.26.2"
               imagePullPolicy: Always
               command:
                 - /bin/run-functional-tests.sh

From 2d3025491be327fe73c6769ba1dbc6d5fc422da9 Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Wed, 24 Apr 2024 10:55:08 +0800
Subject: [PATCH 8/8] use discoverySelectors

---
 .../Addons/Partner/Tetrate.io/tetrate-istiod.yaml         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
index f78a4ae1..e66fc281 100644
--- a/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
+++ b/eks-anywhere-common/Addons/Partner/Tetrate.io/tetrate-istiod.yaml
@@ -21,4 +21,12 @@ spec:
       revision: 1-18-1
     global:
       istioNamespace: tetrate-istio-system
+    pilot:
+      env:
+        ENABLE_ENHANCED_RESOURCE_SCOPING: "true" # need this before v1.22
+    meshConfig:
+      discoverySelectors:
+        - matchLabels:
+            aws.conformance.vendor: tetrate.io
+            aws.conformance.vendor-solution: tetrate-istio-distribution
   interval: 1m0s