From ac5667ee4030072c59d174f174870521ea4a5205 Mon Sep 17 00:00:00 2001
From: Gerd Oberlechner <goberlec@redhat.com>
Date: Tue, 7 Jan 2025 12:53:39 +0100
Subject: [PATCH] upgrade istio to 1.23 (#1039)

upgrade istio to 1-23

---------

Signed-off-by: Gerd Oberlechner <goberlec@redhat.com>
---
 config/config.yaml                           |  4 ++--
 config/public-cloud-cs-pr.json               |  4 ++--
 config/public-cloud-dev.json                 |  4 ++--
 config/public-cloud-personal-dev.json        |  4 ++--
 dev-infrastructure/Makefile                  | 11 ++++++-----
 dev-infrastructure/scripts/aks-kubeconfig.sh |  9 +++++++++
 6 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100755 dev-infrastructure/scripts/aks-kubeconfig.sh

diff --git a/config/config.yaml b/config/config.yaml
index 1934bdd73..aca22ebc9 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -31,8 +31,8 @@ defaults:
     istio:
       istioctlVersion: "1.23.1"
       tag: "prod-stable"
-      targetVersion: "asm-1-22"
-      versions: "asm-1-22"
+      targetVersion: "asm-1-23"
+      versions: "asm-1-22,asm-1-23"
 
   # MGMT cluster specifics
   mgmt:
diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json
index 2db4731e7..f597fb074 100644
--- a/config/public-cloud-cs-pr.json
+++ b/config/public-cloud-cs-pr.json
@@ -180,8 +180,8 @@
     "istio": {
       "istioctlVersion": "1.23.1",
       "tag": "prod-stable",
-      "targetVersion": "asm-1-22",
-      "versions": "asm-1-22"
+      "targetVersion": "asm-1-23",
+      "versions": "asm-1-22,asm-1-23"
     },
     "rg": "hcp-underlay-cspr-svc",
     "subscription": "ARO Hosted Control Planes (EA Subscription 1)",
diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json
index 914fe6be3..72f36985a 100644
--- a/config/public-cloud-dev.json
+++ b/config/public-cloud-dev.json
@@ -180,8 +180,8 @@
     "istio": {
       "istioctlVersion": "1.23.1",
       "tag": "prod-stable",
-      "targetVersion": "asm-1-22",
-      "versions": "asm-1-22"
+      "targetVersion": "asm-1-23",
+      "versions": "asm-1-22,asm-1-23"
     },
     "rg": "hcp-underlay-dev-svc",
     "subscription": "ARO Hosted Control Planes (EA Subscription 1)",
diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json
index ae9585522..a2d454ac2 100644
--- a/config/public-cloud-personal-dev.json
+++ b/config/public-cloud-personal-dev.json
@@ -180,8 +180,8 @@
     "istio": {
       "istioctlVersion": "1.23.1",
       "tag": "prod-stable",
-      "targetVersion": "asm-1-22",
-      "versions": "asm-1-22"
+      "targetVersion": "asm-1-23",
+      "versions": "asm-1-22,asm-1-23"
     },
     "rg": "hcp-underlay-usw3tst-svc",
     "subscription": "ARO Hosted Control Planes (EA Subscription 1)",
diff --git a/dev-infrastructure/Makefile b/dev-infrastructure/Makefile
index 16562c08c..b62db1b86 100644
--- a/dev-infrastructure/Makefile
+++ b/dev-infrastructure/Makefile
@@ -213,7 +213,10 @@ svc: svc.rg
 			configurations/svc-cluster.bicepparam \
 		--parameters \
 			persist=${PERSIST}
-	@TARGET_VERSION=$(ISTIO_TARGET_VERSION) ISTIOCTL_VERSION=$(ISTIOCTL_VERSION) TAG=$(ISTIO_TAG) scripts/istio.sh
+
+	@scripts/aks-admin-access.sh $(SVC_RESOURCEGROUP) $(PRINCIPAL_ID)
+	@scripts/aks-kubeconfig.sh $(SVC_RESOURCEGROUP) $(AKS_NAME) "$(SVC_KUBECONFIG_FILE)"
+	@KUBEONFIG=$(SVC_KUBECONFIG_FILE) TARGET_VERSION=$(ISTIO_TARGET_VERSION) ISTIOCTL_VERSION=$(ISTIOCTL_VERSION) TAG=$(ISTIO_TAG) scripts/istio.sh
 .PHONY: svc
 
 svc.enable-aks-metrics:
@@ -244,8 +247,7 @@ svc.aks.admin-access:
 .PHONY: svc.aks.admin-access
 
 svc.aks.kubeconfig:
-	@az aks get-credentials --overwrite-existing --only-show-errors -n ${AKS_NAME} -g $(SVC_RESOURCEGROUP) -f "${SVC_KUBECONFIG_FILE}"
-	@kubelogin convert-kubeconfig -l azurecli --kubeconfig "${SVC_KUBECONFIG_FILE}"
+	@scripts/aks-kubeconfig.sh $(SVC_RESOURCEGROUP) $(AKS_NAME) "$(SVC_KUBECONFIG_FILE)"
 .PHONY: svc.aks.kubeconfig
 
 svc.aks.kubeconfigfile:
@@ -357,8 +359,7 @@ mgmt.aks.admin-access:
 .PHONY: mgmt.aks.admin-access
 
 mgmt.aks.kubeconfig: mgmt.aks.kubeconfigfile
-	@az aks get-credentials --overwrite-existing --only-show-errors -n ${AKS_NAME} -g $(MGMT_RESOURCEGROUP) -f "${MGMT_KUBECONFIG_FILE}"
-	@kubelogin convert-kubeconfig -l azurecli --kubeconfig "${MGMT_KUBECONFIG_FILE}"
+	@scripts/aks-kubeconfig.sh $(MGMT_RESOURCEGROUP) $(AKS_NAME) "$(MGMT_KUBECONFIG_FILE)"
 .PHONY: mgmt.aks.kubeconfig
 
 mgmt.aks.kubeconfigfile:
diff --git a/dev-infrastructure/scripts/aks-kubeconfig.sh b/dev-infrastructure/scripts/aks-kubeconfig.sh
new file mode 100755
index 000000000..adc31502b
--- /dev/null
+++ b/dev-infrastructure/scripts/aks-kubeconfig.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+RESOURCEGROUP=$1
+AKS_NAME=$2
+FILENAME=$3
+
+az aks get-credentials --overwrite-existing --only-show-errors -n ${AKS_NAME} -g ${RESOURCEGROUP} -f ${FILENAME}
+kubelogin convert-kubeconfig -l azurecli --kubeconfig "${FILENAME}"