Skip to content

Commit 9f43fc5

Browse files
Flatten "network" value in ztunnel charts (#57881)
Make the "network" value flatten and configurable by both approaches: `helm template manifests/charts/ztunnel --set network=net1` `helm template manifests/charts/ztunnel --set global.network=net1` Signed-off-by: Maxim Babushkin <[email protected]> Co-authored-by: Maxim Babushkin <[email protected]>
1 parent 653f4ef commit 9f43fc5

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

manifests/charts/ztunnel/templates/daemonset.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ spec:
115115
- name: LOG_FORMAT
116116
value: json
117117
{{- end}}
118-
{{- if .Values.global.network }}
118+
{{- if .Values.network }}
119119
- name: NETWORK
120-
value: {{ .Values.global.network | quote }}
120+
value: {{ .Values.network | quote }}
121121
{{- end }}
122122
- name: RUST_LOG
123123
value: {{ .Values.logLevel | quote }}
@@ -192,7 +192,7 @@ spec:
192192
projected:
193193
sources:
194194
- clusterTrustBundle:
195-
name: istio.io:istiod-ca:{{ .Values.global.trustBundleName | default "root-cert" }}
195+
name: istio.io:istiod-ca:{{ .Values.trustBundleName | default "root-cert" }}
196196
path: root-cert.pem
197197
{{- else }}
198198
configMap:

manifests/charts/ztunnel/values.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ _internal_defaults_do_not_set:
1212
# If Image contains a "/", it will replace the entire `image` in the pod.
1313
image: ztunnel
1414

15-
# We keep the global namespace around for backwards-compatibility
16-
global:
17-
# Network defines the network this cluster belong to. This name
18-
# corresponds to the networks in the map of mesh networks.
19-
network: ""
15+
# Same as `global.network`, but will override it if set.
16+
# Network defines the network this cluster belong to. This name
17+
# corresponds to the networks in the map of mesh networks.
18+
network: ""
2019

2120
# resourceName, if set, will override the naming of resources. If not set, will default to 'ztunnel'.
2221
# If you set this, you MUST also set `trustedZtunnelName` in the `istiod` chart.

0 commit comments

Comments
 (0)