From 8df4e5ca150305ddc910ebfafe0b1307ed9ff338 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Tue, 22 Aug 2023 09:47:30 -0400
Subject: [PATCH] update istio to 1.18.2

---
 .../1.25/common-services/main.tf                     |  6 +++---
 .../common-services/variables.images.auto.tfvars     | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf b/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf
index 3338eb4..fb4584e 100644
--- a/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf
+++ b/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf
@@ -328,12 +328,12 @@ resource "helm_release" "istio-operator" {
   set {
     name = "hub"
     #    value = format("%v/%v", local.account_ecr, "istio")
-    value = format("%v/eks/%v/%v", local.image_output["istio-operator"].dest_registry, var.cluster_name, "istio")
+    value = format("%v/eks/%v/%v", local.image_output["istio/operator"].dest_registry, var.cluster_name, "istio")
   }
   set {
     name = "tag"
     #    value = var.istio_tag
-    value = local.image_output["istio-operator"].tag
+    value = local.image_output["istio/operator"].tag
   }
   set {
     name  = "operatorNamespace"
@@ -366,7 +366,7 @@ resource "helm_release" "istio-profile" {
   set {
     name = "hub"
     #    value = format("%v/%v", local.account_ecr, "istio")
-    value = format("%v/eks/%v/%v", local.image_output["istio-operator"].dest_registry, var.cluster_name, "istio")
+    value = format("%v/eks/%v/%v", local.image_output["istio/operator"].dest_registry, var.cluster_name, "istio")
   }
   set {
     name  = "tag"
diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars
index d6d61b3..f14433f 100644
--- a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars
+++ b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars
@@ -81,33 +81,33 @@ image_details = {
     enabled         = true
   }
   "istio-operator" = {
-    name            = "istio-operator"
+    name            = "istio/operator"
     image           = "docker.io/istio/operator"
     dest_path       = null
     source_registry = "docker.io"
     source_image    = "istio/operator"
     source_tag      = null
-    tag             = "1.16.1"
+    tag             = "1.18.2"
     enabled         = true
   }
   "istio-pilot" = {
-    name            = "istio-pilot"
+    name            = "istio/pilot"
     image           = "docker.io/istio/pilot"
     dest_path       = null
     source_registry = "docker.io"
     source_image    = "istio/pilot"
     source_tag      = null
-    tag             = "1.16.1"
+    tag             = "1.18.2"
     enabled         = true
   }
   "istio-proxyv2" = {
-    name            = "istio-proxyv2"
+    name            = "istio/proxyv2"
     image           = "docker.io/istio/proxyv2"
     dest_path       = null
     source_registry = "docker.io"
     source_image    = "istio/proxyv2"
     source_tag      = null
-    tag             = "1.16.1"
+    tag             = "1.18.2"
     enabled         = true
   }
   "prometheus-operator" = {