Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions config/dev.digests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions config/rendered/dev/cspr/westus3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/rendered/dev/dev/westus3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/rendered/dev/perf/westus3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/rendered/dev/pers/westus3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rendered/dev/prow/westus3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rendered/dev/swft/uksouth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 3 additions & 1 deletion istio/deploy/templates/istio-shared-configmap.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ range $version := .Values.istioVersions }}
{{ range $versionList := .Values.istioVersions }}
{{ range $version := splitList "," $versionList }}
---
kind: ConfigMap
apiVersion: v1
Expand All @@ -17,3 +18,4 @@ data:
includeRequestHeadersInCheck: ["x-ext-authz", "mise-inbound-policies-to-filter"]
pathPrefix: "/v1/EnvoyValidateRequest"
{{ end }}
{{ end }}
18 changes: 18 additions & 0 deletions istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.