diff --git a/config/config.yaml b/config/config.yaml index 2456eece42..9123e849bf 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,asm-1-25" aks: etcd: softDelete: false diff --git a/config/dev.digests.yaml b/config/dev.digests.yaml index b5c43c870c..f98f2dca12 100644 --- a/config/dev.digests.yaml +++ b/config/dev.digests.yaml @@ -3,19 +3,19 @@ clouds: environments: cspr: regions: - westus3: b7dba8105a51d503c1a0ccf070261f37b6656119d6bb2ffbf7e1b1f7e201b3b6 + westus3: 067f0e6e0dd87c64837d6f9855f2f61e8fd32e9ff57ef8bbe32b3bfb8bbc5eaf dev: regions: - westus3: 4322e33979adbefe7359bc517760860c71091073806fd02c2bd03a8e4025f43f + westus3: f0e128526afc9951d83b436ead495e2b952cfb258ef87550d404e21469f8c305 perf: regions: - westus3: a9997a5fb839e12fd784d73e4a6bdeb2d5452b427a0b0d29469c94c712d6f565 + westus3: 70c1bc2b2c25e566b5cd5fb0db7edc44b1df7c60b088c9aa93ac37dac3b5cfc5 pers: regions: - westus3: 648f9eb2e86218f8f7e3d3cd5a7179b8cc51f5237bbe45c17adece272ec8237f + westus3: 217e77a767bfc387f66b18e5fe49b63f8b5f2b5174f657f9eedeb71c25127d1a prow: regions: - westus3: 5b58e748efb966e8fd8fcb4f2df3ffc8794146d5ae594d53cbe5c57e0f492aa7 + westus3: a00a84fe65630bf239d45d806606286bf0eed9ce09151b9951e0e96ef059aeb6 swft: regions: - uksouth: bbaae11d4883995fbd2618e7c98e96734409bb84d0e3d0e3aaf618bd66642b5e + uksouth: 2e333b37b49e55b766f1a9b336178a48db76e83348adedd69075fae166ab10bd diff --git a/config/rendered/dev/cspr/westus3.yaml b/config/rendered/dev/cspr/westus3.yaml index b0ff5cbf1b..9cb8e071ec 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,asm-1-25 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..3db8140886 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,asm-1-25 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..42fab27d0d 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,asm-1-25 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..af5484fbd4 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,asm-1-25 jaeger: deploy: true nsp: diff --git a/config/rendered/dev/prow/westus3.yaml b/config/rendered/dev/prow/westus3.yaml index 675f684e78..8ff03124f9 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,asm-1-25 jaeger: deploy: true nsp: diff --git a/config/rendered/dev/swft/uksouth.yaml b/config/rendered/dev/swft/uksouth.yaml index 2e1104de9c..a9c0a547ed 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,asm-1-25 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..3d692e5e4a 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 @@ -2,6 +2,24 @@ # Source: istio/templates/istio-shared-configmap.yml kind: ConfigMap apiVersion: v1 +metadata: + labels: + istio.io/rev: 'asm-1-26' + name: istio-shared-configmap-asm-1-26 + namespace: aks-istio-system +data: + mesh: |- + extensionProviders: + - name: "ext-authz" + envoyExtAuthzHttp: + service: "mise/mise.mise.svc.cluster.local" + port: "8080" + includeRequestHeadersInCheck: ["x-ext-authz", "mise-inbound-policies-to-filter"] + pathPrefix: "/v1/EnvoyValidateRequest" +--- +# Source: istio/templates/istio-shared-configmap.yml +kind: ConfigMap +apiVersion: v1 metadata: labels: istio.io/rev: 'asm-1-25' 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..a227aaa8e0 100644 --- a/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml +++ b/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml @@ -2,6 +2,24 @@ # Source: istio/templates/istio-shared-configmap.yml kind: ConfigMap apiVersion: v1 +metadata: + labels: + istio.io/rev: 'asm-1-26' + name: istio-shared-configmap-asm-1-26 + namespace: aks-istio-system +data: + mesh: |- + extensionProviders: + - name: "ext-authz" + envoyExtAuthzHttp: + service: "mise/mise.mise.svc.cluster.local" + port: "8080" + includeRequestHeadersInCheck: ["x-ext-authz", "mise-inbound-policies-to-filter"] + pathPrefix: "/v1/EnvoyValidateRequest" +--- +# Source: istio/templates/istio-shared-configmap.yml +kind: ConfigMap +apiVersion: v1 metadata: labels: istio.io/rev: 'asm-1-25'