From dda3dcf67ff78d40167858bdb44b6d36fa35990c Mon Sep 17 00:00:00 2001 From: Petr McAllister Date: Tue, 23 Apr 2024 16:46:33 -0700 Subject: [PATCH 1/4] Solo.io adding revision support Signed-off-by: Petr McAllister --- .../Addons/Partner/Solo.io/namespace.yaml | 11 ++++++++- .../Partner/Solo.io/solo-istiod-source.yaml | 4 ++++ .../Addons/Partner/Solo.io/solo-istiod.yaml | 16 +++++++++++++ .../Testers/Solo.io/solo-istiod-testJob.yaml | 10 ++++++++ .../Solo.io/solo-istiod-testjob-script.yaml | 24 +++++++++---------- .../Testers/Solo.io/test-job-role.yaml | 12 ++++++++++ 6 files changed, 64 insertions(+), 13 deletions(-) diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml index e65b59c0..f954c484 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml @@ -1,8 +1,17 @@ apiVersion: v1 kind: Namespace metadata: +<<<<<<< HEAD name: istio-system labels: aws.conformance.vendor: solo.io aws.conformance.vendor-solution: solo-istiod - aws.conformance.vendor-solution-version: 1.18.3-eks-a \ No newline at end of file + aws.conformance.vendor-solution-version: 1.18.3-eks-a +======= + name: solo-istio-system + labels: + istio.io/rev: 1-18-3-solo + aws.conformance.vendor: solo.io + aws.conformance.vendor-solution: solo-istiod + aws.conformance.vendor-solution-version: 1.18.3-eks-a +>>>>>>> 9937293 (Solo.io adding revision support) diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml index 4089eb46..9620e269 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml @@ -1,4 +1,8 @@ +<<<<<<< HEAD --- +======= + +>>>>>>> 9937293 (Solo.io adding revision support) apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository metadata: diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml index e055c25c..dac110cb 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml @@ -1,9 +1,16 @@ +<<<<<<< HEAD --- +======= +>>>>>>> 9937293 (Solo.io adding revision support) apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: solo-istiod +<<<<<<< HEAD namespace: istio-system +======= + namespace: solo-istio-system +>>>>>>> 9937293 (Solo.io adding revision support) spec: chart: spec: @@ -14,4 +21,13 @@ spec: name: solo-istiod-charts namespace: flux-system version: 1.18.3-eks-a +<<<<<<< HEAD interval: 1m0s +======= + values: + revision: 1-18-3-solo + global: + istioNamespace: solo-istio-system + interval: 1m0s + +>>>>>>> 9937293 (Solo.io adding revision support) diff --git a/eks-anywhere-common/Testers/Solo.io/solo-istiod-testJob.yaml b/eks-anywhere-common/Testers/Solo.io/solo-istiod-testJob.yaml index 4985f2fb..f0e1ae9c 100644 --- a/eks-anywhere-common/Testers/Solo.io/solo-istiod-testJob.yaml +++ b/eks-anywhere-common/Testers/Solo.io/solo-istiod-testJob.yaml @@ -2,12 +2,22 @@ apiVersion: batch/v1 kind: CronJob metadata: name: solo-istiod-health-test +<<<<<<< HEAD namespace: istio-system +======= + namespace: solo-istio-system +>>>>>>> 9937293 (Solo.io adding revision support) spec: schedule: "10 10 * * *" jobTemplate: spec: template: +<<<<<<< HEAD +======= + metadata: + annotations: + sidecar.istio.io/inject: "false" +>>>>>>> 9937293 (Solo.io adding revision support) spec: containers: - name: solo-istiod-healthtest diff --git a/eks-anywhere-common/Testers/Solo.io/solo-istiod-testjob-script.yaml b/eks-anywhere-common/Testers/Solo.io/solo-istiod-testjob-script.yaml index 9673913f..235784d0 100644 --- a/eks-anywhere-common/Testers/Solo.io/solo-istiod-testjob-script.yaml +++ b/eks-anywhere-common/Testers/Solo.io/solo-istiod-testjob-script.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: tetsjob-script - namespace: istio-system + namespace: solo-istio-system data: run-functional-tests.sh: |- #!/bin/sh @@ -10,8 +10,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 solo-istio-system + kubectl delete deployment custom-ingressgateway -n solo-istio-system # Any additional cleanup commands go here echo "Cleanup completed." } @@ -33,7 +33,7 @@ data: kind: Deployment metadata: name: custom-ingressgateway - namespace: istio-system + namespace: solo-istio-system spec: replicas: 1 selector: @@ -53,7 +53,7 @@ data: EOF # Verify the custom gateway has been deployed - kubectl get deployment custom-ingressgateway -n istio-system + kubectl get deployment custom-ingressgateway -n solo-istio-system } deploy_test_gateway() { @@ -63,7 +63,7 @@ data: kind: Gateway metadata: name: httpbin-gateway - namespace: istio-system + namespace: solo-istio-system spec: selector: istio: custom-ingress-gw # this should match the label of your Istio ingress gateway deployment @@ -77,7 +77,7 @@ data: EOF # Verify the Gateway has been created - kubectl get gateway httpbin-gateway -n istio-system + kubectl get gateway httpbin-gateway -n solo-istio-system } deploy_test_virtualservice() { @@ -87,7 +87,7 @@ data: kind: VirtualService metadata: name: httpbin-virtualservice - namespace: istio-system + namespace: solo-istio-system spec: hosts: - "httpbin.example.com" @@ -105,15 +105,15 @@ data: EOF # Verify the VirtualService has been created - kubectl get virtualservice httpbin-virtualservice -n istio-system + kubectl get virtualservice httpbin-virtualservice -n solo-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}') + local ingress_gateway_pod=$(kubectl get pod -l istio=custom-ingress-gw -n solo-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') + local gateway_status=$(kubectl exec "$ingress_gateway_pod" -n solo-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." @@ -127,7 +127,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 solo-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/Solo.io/test-job-role.yaml b/eks-anywhere-common/Testers/Solo.io/test-job-role.yaml index 54d3158e..cf803ef0 100644 --- a/eks-anywhere-common/Testers/Solo.io/test-job-role.yaml +++ b/eks-anywhere-common/Testers/Solo.io/test-job-role.yaml @@ -2,7 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: solo-istiod-job-role +<<<<<<< HEAD namespace: istio-system +======= + namespace: solo-istio-system +>>>>>>> 9937293 (Solo.io adding revision support) rules: - apiGroups: [""] resources: ["pods", "pods/exec", "services"] @@ -18,11 +22,19 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: solo-istiod-job-rolebinding +<<<<<<< HEAD namespace: istio-system subjects: - kind: ServiceAccount name: default namespace: istio-system +======= + namespace: solo-istio-system +subjects: + - kind: ServiceAccount + name: default + namespace: solo-istio-system +>>>>>>> 9937293 (Solo.io adding revision support) roleRef: kind: Role name: solo-istiod-job-role From 9f7e041780a323cef9eac321628cf738391af64e Mon Sep 17 00:00:00 2001 From: Petr McAllister Date: Tue, 23 Apr 2024 17:03:49 -0700 Subject: [PATCH 2/4] Resolve conflicts Signed-off-by: Petr McAllister --- .../Testers/Solo.io/solo-istiod-testJob.yaml | 7 ------- .../Testers/Solo.io/test-job-role.yaml | 12 ------------ 2 files changed, 19 deletions(-) diff --git a/eks-anywhere-common/Testers/Solo.io/solo-istiod-testJob.yaml b/eks-anywhere-common/Testers/Solo.io/solo-istiod-testJob.yaml index f0e1ae9c..46b88e74 100644 --- a/eks-anywhere-common/Testers/Solo.io/solo-istiod-testJob.yaml +++ b/eks-anywhere-common/Testers/Solo.io/solo-istiod-testJob.yaml @@ -2,22 +2,15 @@ apiVersion: batch/v1 kind: CronJob metadata: name: solo-istiod-health-test -<<<<<<< HEAD - namespace: istio-system -======= namespace: solo-istio-system ->>>>>>> 9937293 (Solo.io adding revision support) spec: schedule: "10 10 * * *" jobTemplate: spec: template: -<<<<<<< HEAD -======= metadata: annotations: sidecar.istio.io/inject: "false" ->>>>>>> 9937293 (Solo.io adding revision support) spec: containers: - name: solo-istiod-healthtest diff --git a/eks-anywhere-common/Testers/Solo.io/test-job-role.yaml b/eks-anywhere-common/Testers/Solo.io/test-job-role.yaml index cf803ef0..e56b364a 100644 --- a/eks-anywhere-common/Testers/Solo.io/test-job-role.yaml +++ b/eks-anywhere-common/Testers/Solo.io/test-job-role.yaml @@ -2,11 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: solo-istiod-job-role -<<<<<<< HEAD - namespace: istio-system -======= namespace: solo-istio-system ->>>>>>> 9937293 (Solo.io adding revision support) rules: - apiGroups: [""] resources: ["pods", "pods/exec", "services"] @@ -22,19 +18,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: solo-istiod-job-rolebinding -<<<<<<< HEAD - namespace: istio-system -subjects: - - kind: ServiceAccount - name: default - namespace: istio-system -======= namespace: solo-istio-system subjects: - kind: ServiceAccount name: default namespace: solo-istio-system ->>>>>>> 9937293 (Solo.io adding revision support) roleRef: kind: Role name: solo-istiod-job-role From f64d1002ad7128966458705ffac881475461b065 Mon Sep 17 00:00:00 2001 From: Petr McAllister Date: Tue, 23 Apr 2024 17:05:42 -0700 Subject: [PATCH 3/4] Resolve conflicts Signed-off-by: Petr McAllister --- eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml | 8 -------- .../Addons/Partner/Solo.io/solo-istiod-source.yaml | 5 ----- 2 files changed, 13 deletions(-) diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml index f954c484..224c9360 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/namespace.yaml @@ -1,17 +1,9 @@ apiVersion: v1 kind: Namespace metadata: -<<<<<<< HEAD - name: istio-system - labels: - aws.conformance.vendor: solo.io - aws.conformance.vendor-solution: solo-istiod - aws.conformance.vendor-solution-version: 1.18.3-eks-a -======= name: solo-istio-system labels: istio.io/rev: 1-18-3-solo aws.conformance.vendor: solo.io aws.conformance.vendor-solution: solo-istiod aws.conformance.vendor-solution-version: 1.18.3-eks-a ->>>>>>> 9937293 (Solo.io adding revision support) diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml index 9620e269..04aed2e5 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod-source.yaml @@ -1,8 +1,3 @@ -<<<<<<< HEAD ---- -======= - ->>>>>>> 9937293 (Solo.io adding revision support) apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository metadata: From e6d849e44bc6fc7a7ea71cb51fd84ee7ee95caff Mon Sep 17 00:00:00 2001 From: Petr McAllister Date: Tue, 23 Apr 2024 17:07:02 -0700 Subject: [PATCH 4/4] Resolve conflicts Signed-off-by: Petr McAllister --- .../Addons/Partner/Solo.io/solo-istiod.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml index dac110cb..3a14cc1e 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml @@ -1,16 +1,8 @@ -<<<<<<< HEAD ---- -======= ->>>>>>> 9937293 (Solo.io adding revision support) apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: solo-istiod -<<<<<<< HEAD - namespace: istio-system -======= namespace: solo-istio-system ->>>>>>> 9937293 (Solo.io adding revision support) spec: chart: spec: @@ -21,13 +13,9 @@ spec: name: solo-istiod-charts namespace: flux-system version: 1.18.3-eks-a -<<<<<<< HEAD - interval: 1m0s -======= values: revision: 1-18-3-solo global: istioNamespace: solo-istio-system interval: 1m0s ->>>>>>> 9937293 (Solo.io adding revision support)