From 66b0283dcc69845cf8a9bb97a830f7f4b516409c Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Wed, 26 Jul 2023 07:38:57 -0400
Subject: [PATCH] change k8s registry, update image process

---
 .../1.25/addons/variables.addons.tf           |  7 +++--
 .../1.25/bin/copy_image.sh                    |  4 ++-
 .../templates/istiooperator.yaml              |  4 +--
 .../variables.common-services.auto.tfvars     | 29 +++++++++++++++++--
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/examples/full-cluster-tf-upgrade/1.25/addons/variables.addons.tf b/examples/full-cluster-tf-upgrade/1.25/addons/variables.addons.tf
index 26f1389..fcbe3c2 100644
--- a/examples/full-cluster-tf-upgrade/1.25/addons/variables.addons.tf
+++ b/examples/full-cluster-tf-upgrade/1.25/addons/variables.addons.tf
@@ -3,9 +3,9 @@ variable "addon_versions" {
   type        = map(map(string))
   default = {
     "1.24" = {
-      "coredns"            = null
-      "kube-proxy"         = null
-      "vpc-cni"            = null
+      "coredns"            = "v1.8.7-eksbuild.3"
+      "kube-proxy"         = "v1.24.7-eksbuild.2"
+      "vpc-cni"            = "v1.11.4-eksbuild.1"
       "aws-ebs-csi-driver" = "v1.18.0-eksbuild.1"
     }
     "1.25" = {
@@ -17,3 +17,4 @@ variable "addon_versions" {
   }
 }
 
+
diff --git a/examples/full-cluster-tf-upgrade/1.25/bin/copy_image.sh b/examples/full-cluster-tf-upgrade/1.25/bin/copy_image.sh
index 60e8847..60fad27 100755
--- a/examples/full-cluster-tf-upgrade/1.25/bin/copy_image.sh
+++ b/examples/full-cluster-tf-upgrade/1.25/bin/copy_image.sh
@@ -304,7 +304,9 @@ copy_image() {
 	echo "Copying $SOURCE_IMAGE"
 	echo "to $DESTINATION_IMAGE"
 
-	${command[@]}
+	while ! ${command[@]}; do
+		echo "Retrying uploading image..."
+	done
 }
 
 
diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/charts/istio-profile/templates/istiooperator.yaml b/examples/full-cluster-tf-upgrade/1.25/common-services/charts/istio-profile/templates/istiooperator.yaml
index 5062e95..6131cbc 100644
--- a/examples/full-cluster-tf-upgrade/1.25/common-services/charts/istio-profile/templates/istiooperator.yaml
+++ b/examples/full-cluster-tf-upgrade/1.25/common-services/charts/istio-profile/templates/istiooperator.yaml
@@ -4,7 +4,7 @@ metadata:
   name: istio-profile
 spec:
   hub: {{ .Values.hub | default "docker.io/istio" }}
-  tag: {{ .Values.tag | default "1.10.1" }}
+  tag: {{ .Values.tag | default "1.16.1" }}
 
   meshConfig:
 {{- if .Values.envoy.accessLog.enabled }}
@@ -160,7 +160,6 @@ spec:
 
     gateways:
       istio-egressgateway:
-        zvpn: {}
         env: {}
         autoscaleEnabled: true
         type: ClusterIP
@@ -177,7 +176,6 @@ spec:
         autoscaleEnabled: true
         type: LoadBalancer
         name: istio-ingressgateway
-        zvpn: {}
         env: {}
         secretVolumes:
           - name: ingressgateway-certs
diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars
index a1cf17f..f969ef4 100644
--- a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars
+++ b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars
@@ -65,11 +65,10 @@ image_details = {
     source_tag      = "v1.12.2"
     enabled         = true
   }
-
   "cluster-autoscaler" = {
     name            = "cluster-autoscaler"
-    image           = "k8s.gcr.io/autoscaling/cluster-autoscaler"
-    source_registry = "k8s.gcr.io"
+    image           = "registry.k8s.io/autoscaling/cluster-autoscaler"
+    source_registry = "registry.k8s.io"
     source_image    = "autoscaling/cluster-autoscaler"
     source_tag      = "v1.24.0"
     enabled         = true
@@ -106,4 +105,28 @@ image_details = {
     source_tag      = "1.16.1"
     enabled         = true
   }
+  "prometheus-operator" = {
+    name            = "prometheus-operator"
+    image           = "docker.io/bitnami/prometheus-operator"
+    source_registry = "docker.io"
+    source_image    = "bitnami/prometheus-operator"
+    source_tag      = "0.50.0"
+    enabled         = true
+  }
+  "prometheus" = {
+    name            = "prometheus"
+    image           = "docker.io/bitnami/prometheus"
+    source_registry = "docker.io"
+    source_mage     = "bitnami/prometheus"
+    tag             = "2.28.1"
+    enabled         = true
+  }
+  "alertmanager" = {
+    name           = "alertmanager"
+    image          = "docker.io/bitnami/alertmanager"
+    soure_registry = "docker.io"
+    soure_image    = "bitnami/alertmanager"
+    tag            = "0.22.2"
+    enabled        = true
+  }
 }