Skip to content
Merged
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"
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: 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
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
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
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
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
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
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
nsp:
accessMode: Learning
name: nsp-lnstest-svc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: |-
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 }}
Original file line number Diff line number Diff line change
Expand Up @@ -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: |-
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.