diff --git a/config/config.yaml b/config/config.yaml index 2456eece42..cf5882a1fb 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -992,8 +992,8 @@ clouds: nsp: accessMode: 'Learning' istio: - targetVersion: "asm-1-25" - versions: "asm-1-25" + targetVersion: "asm-1-26" + versions: "asm-1-26" aks: etcd: softDelete: false diff --git a/config/dev.digests.yaml b/config/dev.digests.yaml index b5c43c870c..17690e259d 100644 --- a/config/dev.digests.yaml +++ b/config/dev.digests.yaml @@ -3,19 +3,19 @@ clouds: environments: cspr: regions: - westus3: b7dba8105a51d503c1a0ccf070261f37b6656119d6bb2ffbf7e1b1f7e201b3b6 + westus3: cffe30b492d28a9ed26afb7cb4a48eb46f0550b88aeff5fc9d3a5557ecd61ad1 dev: regions: - westus3: 4322e33979adbefe7359bc517760860c71091073806fd02c2bd03a8e4025f43f + westus3: 689cae6da430790fa5dc141a21d93b1ccde61a9bfa42808f2bfd971a25e54f83 perf: regions: - westus3: a9997a5fb839e12fd784d73e4a6bdeb2d5452b427a0b0d29469c94c712d6f565 + westus3: ce4beac7562dd549899b3b0e0da1501f7c6ed6534214ab93abab11df50998614 pers: regions: - westus3: 648f9eb2e86218f8f7e3d3cd5a7179b8cc51f5237bbe45c17adece272ec8237f + westus3: a993fd332e3fe39ae0e05c78f0d77b6de0f637fbdc286a758ecb08b610506da4 prow: regions: - westus3: 5b58e748efb966e8fd8fcb4f2df3ffc8794146d5ae594d53cbe5c57e0f492aa7 + westus3: 609c74619d39b90456064244486e8cf3994ef03e3ef40663dc8a6308425f37ca swft: regions: - uksouth: bbaae11d4883995fbd2618e7c98e96734409bb84d0e3d0e3aaf618bd66642b5e + uksouth: 7a09385051c1fdc0700b14be9a13a6ef6b93e8ab8d93a1110aeef97d8c438b47 diff --git a/config/rendered/dev/cspr/westus3.yaml b/config/rendered/dev/cspr/westus3.yaml index b0ff5cbf1b..cdbe19c04b 100755 --- a/config/rendered/dev/cspr/westus3.yaml +++ b/config/rendered/dev/cspr/westus3.yaml @@ -751,8 +751,8 @@ svc: ingressGatewayIPAddressName: aro-hcp-istio-ingress istioctlVersion: 1.24.1 tag: prod-stable - targetVersion: asm-1-25 - versions: asm-1-25 + targetVersion: asm-1-26 + versions: asm-1-26 nsp: accessMode: Learning name: nsp-usw3-svc diff --git a/config/rendered/dev/dev/westus3.yaml b/config/rendered/dev/dev/westus3.yaml index 4160609e7b..186dbc1b79 100755 --- a/config/rendered/dev/dev/westus3.yaml +++ b/config/rendered/dev/dev/westus3.yaml @@ -751,8 +751,8 @@ svc: ingressGatewayIPAddressName: aro-hcp-istio-ingress istioctlVersion: 1.24.1 tag: prod-stable - targetVersion: asm-1-25 - versions: asm-1-25 + targetVersion: asm-1-26 + versions: asm-1-26 nsp: accessMode: Learning name: nsp-usw3-svc diff --git a/config/rendered/dev/perf/westus3.yaml b/config/rendered/dev/perf/westus3.yaml index 5a8139ab85..22f1817d2b 100755 --- a/config/rendered/dev/perf/westus3.yaml +++ b/config/rendered/dev/perf/westus3.yaml @@ -751,8 +751,8 @@ svc: ingressGatewayIPAddressName: aro-hcp-istio-ingress istioctlVersion: 1.24.1 tag: prod-stable - targetVersion: asm-1-25 - versions: asm-1-25 + targetVersion: asm-1-26 + versions: asm-1-26 nsp: accessMode: Learning name: nsp-usw3ptest-svc diff --git a/config/rendered/dev/pers/westus3.yaml b/config/rendered/dev/pers/westus3.yaml index 9bfdbbcf0f..c39aec2aea 100755 --- a/config/rendered/dev/pers/westus3.yaml +++ b/config/rendered/dev/pers/westus3.yaml @@ -753,8 +753,8 @@ svc: ingressGatewayIPAddressName: aro-hcp-istio-ingress istioctlVersion: 1.24.1 tag: prod-stable - targetVersion: asm-1-25 - versions: asm-1-25 + targetVersion: asm-1-26 + versions: asm-1-26 jaeger: deploy: true nsp: diff --git a/config/rendered/dev/prow/westus3.yaml b/config/rendered/dev/prow/westus3.yaml index 675f684e78..0f088c83a7 100755 --- a/config/rendered/dev/prow/westus3.yaml +++ b/config/rendered/dev/prow/westus3.yaml @@ -753,8 +753,8 @@ svc: ingressGatewayIPAddressName: aro-hcp-istio-ingress istioctlVersion: 1.24.1 tag: prod-stable - targetVersion: asm-1-25 - versions: asm-1-25 + targetVersion: asm-1-26 + versions: asm-1-26 jaeger: deploy: true nsp: diff --git a/config/rendered/dev/swft/uksouth.yaml b/config/rendered/dev/swft/uksouth.yaml index 2e1104de9c..2ea33d65f8 100755 --- a/config/rendered/dev/swft/uksouth.yaml +++ b/config/rendered/dev/swft/uksouth.yaml @@ -753,8 +753,8 @@ svc: ingressGatewayIPAddressName: aro-hcp-istio-ingress istioctlVersion: 1.24.1 tag: prod-stable - targetVersion: asm-1-25 - versions: asm-1-25 + targetVersion: asm-1-26 + versions: asm-1-26 nsp: accessMode: Learning name: nsp-lnstest-svc diff --git a/dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml b/dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml index 005c7663d8..7a592e1a4a 100644 --- a/dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml +++ b/dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml @@ -4,8 +4,8 @@ kind: ConfigMap apiVersion: v1 metadata: labels: - istio.io/rev: 'asm-1-25' - name: istio-shared-configmap-asm-1-25 + istio.io/rev: 'asm-1-26' + name: istio-shared-configmap-asm-1-26 namespace: aks-istio-system data: mesh: |- diff --git a/istio/deploy/templates/istio-shared-configmap.yml b/istio/deploy/templates/istio-shared-configmap.yml index f9eadeb952..fbf953bb12 100644 --- a/istio/deploy/templates/istio-shared-configmap.yml +++ b/istio/deploy/templates/istio-shared-configmap.yml @@ -1,4 +1,5 @@ -{{ range $version := .Values.istioVersions }} +{{ range $versionList := .Values.istioVersions }} +{{ range $version := splitList "," $versionList }} --- kind: ConfigMap apiVersion: v1 @@ -17,3 +18,4 @@ data: includeRequestHeadersInCheck: ["x-ext-authz", "mise-inbound-policies-to-filter"] pathPrefix: "/v1/EnvoyValidateRequest" {{ end }} +{{ end }} \ No newline at end of file diff --git a/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml b/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml index d61b4f20ab..3fa5583235 100644 --- a/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml +++ b/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml @@ -4,8 +4,8 @@ kind: ConfigMap apiVersion: v1 metadata: labels: - istio.io/rev: 'asm-1-25' - name: istio-shared-configmap-asm-1-25 + istio.io/rev: 'asm-1-26' + name: istio-shared-configmap-asm-1-26 namespace: aks-istio-system data: mesh: |-