Skip to content

Commit 3ab29e2

Browse files
authored
Jchrapko/update istio 1 26 (#1311)
1 parent 61ea78a commit 3ab29e2

38 files changed

+285
-122
lines changed

deploy/charts/istio/istio-base/chart/Chart.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 1.24.2
2+
appVersion: 1.26.4
33
description: Helm chart for deploying Istio cluster resources and CRDs
44
icon: https://istio.io/latest/favicons/android-192x192.png
55
keywords:
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# WARNING: DO NOT EDIT, THIS FILE IS A COPY.
2+
# The original version of this file is located at /manifests/helm-profiles directory.
3+
# If you want to make a change in this file, edit the original one and run "make gen".
4+
5+
pilot:
6+
env:
7+
# 1.24 behavioral changes
8+
PILOT_ENABLE_IP_AUTOALLOCATE: "false"
9+
ambient:
10+
dnsCapture: false
11+
reconcileIptablesOnStartup: false
12+
# 1.26 behavioral changes
13+
shareHostNetworkNamespace: true
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# WARNING: DO NOT EDIT, THIS FILE IS A COPY.
2+
# The original version of this file is located at /manifests/helm-profiles directory.
3+
# If you want to make a change in this file, edit the original one and run "make gen".
4+
5+
ambient:
6+
# 1.26 behavioral changes
7+
shareHostNetworkNamespace: true

deploy/charts/istio/istio-base/chart/files/profile-platform-k3s.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
cni:
66
cniConfDir: /var/lib/rancher/k3s/agent/etc/cni/net.d
7-
cniBinDir: /var/lib/rancher/k3s/data/current/bin/
7+
cniBinDir: /var/lib/rancher/k3s/data/cni

deploy/charts/istio/istio-istiod/chart/templates/defaultrevision-validatingadmissionpolicy.yaml renamed to deploy/charts/istio/istio-base/chart/templates/defaultrevision-validatingadmissionpolicy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# moved here from istio/base as it is related to istiod
2-
# it also introduces issues during upgrade with race conditions
31
{{- if and .Values.experimental.stableValidationPolicy (not (eq .Values.defaultRevision "")) }}
42
apiVersion: admissionregistration.k8s.io/v1
53
kind: ValidatingAdmissionPolicy

deploy/charts/istio/istio-istiod/chart/templates/defaultrevision-validatingwebhookconfiguration.yaml renamed to deploy/charts/istio/istio-base/chart/templates/defaultrevision-validatingwebhookconfiguration.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# moved here from istio/base as it is related to istiod
2-
# it also introduces issues during upgrade with race conditions
31
{{- if not (eq .Values.defaultRevision "") }}
42
apiVersion: admissionregistration.k8s.io/v1
53
kind: ValidatingWebhookConfiguration

deploy/charts/istio/istio-base/chart/templates/zzz_profile.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ Finally, we can set all of that under .Values so the chart behaves without aware
2424
{{- $defaults := $.Values._internal_defaults_do_not_set }}
2525
{{- $_ := unset $.Values "_internal_defaults_do_not_set" }}
2626
{{- $profile := dict }}
27-
{{- with .Values.profile }}
27+
{{- with (coalesce ($.Values).profile ($.Values.global).profile) }}
2828
{{- with $.Files.Get (printf "files/profile-%s.yaml" .)}}
2929
{{- $profile = (. | fromYaml) }}
3030
{{- else }}
31-
{{ fail (cat "unknown profile" $.Values.profile) }}
31+
{{ fail (cat "unknown profile" .) }}
3232
{{- end }}
3333
{{- end }}
3434
{{- with .Values.compatibilityVersion }}
@@ -38,11 +38,11 @@ Finally, we can set all of that under .Values so the chart behaves without aware
3838
{{ fail (cat "unknown compatibility version" $.Values.compatibilityVersion) }}
3939
{{- end }}
4040
{{- end }}
41-
{{- if ($.Values.global).platform }}
42-
{{- with $.Files.Get (printf "files/profile-platform-%s.yaml" ($.Values.global).platform) }}
41+
{{- with (coalesce ($.Values).platform ($.Values.global).platform) }}
42+
{{- with $.Files.Get (printf "files/profile-platform-%s.yaml" .) }}
4343
{{- $ignore := mustMergeOverwrite $profile (. | fromYaml) }}
4444
{{- else }}
45-
{{ fail (cat "unknown platform" ($.Values.global).platform) }}
45+
{{ fail (cat "unknown platform" .) }}
4646
{{- end }}
4747
{{- end }}
4848
{{- if $profile }}
@@ -52,6 +52,7 @@ Finally, we can set all of that under .Values so the chart behaves without aware
5252
{{- if false }}
5353
{{- $a := mustMergeOverwrite $defaults ($profile.global) ($.Values.global | default dict) }}
5454
{{- end }}
55+
{{- $x := set $.Values "_original" (deepCopy $.Values) }}
5556
{{- $b := set $ "Values" (mustMergeOverwrite $defaults $.Values) }}
5657

5758
{{/*

deploy/charts/istio/istio-gateway/chart/Chart.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 1.24.2
2+
appVersion: 1.26.4
33
description: Helm chart for deploying Istio gateways
44
icon: https://istio.io/latest/favicons/android-192x192.png
55
keywords:

deploy/charts/istio/istio-gateway/chart/templates/deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ spec:
4141
{{ $key | quote }}: {{ $val | quote }}
4242
{{- end }}
4343
{{- end }}
44+
{{- with .Values.networkGateway }}
45+
topology.istio.io/network: "{{.}}"
46+
{{- end }}
4447
spec:
4548
serviceAccountName: {{ include "gateway.serviceAccountName" . }}
4649
securityContext:

deploy/charts/istio/istio-gateway/chart/templates/service.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ spec:
2121
{{- if hasKey .Values.service "allocateLoadBalancerNodePorts" }}
2222
allocateLoadBalancerNodePorts: {{ .Values.service.allocateLoadBalancerNodePorts }}
2323
{{- end }}
24+
{{- if hasKey .Values.service "loadBalancerClass" }}
25+
loadBalancerClass: {{ .Values.service.loadBalancerClass }}
26+
{{- end }}
2427
{{- end }}
2528
{{- if .Values.service.ipFamilyPolicy }}
2629
ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}

0 commit comments

Comments
 (0)