Skip to content
Open
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
2 changes: 1 addition & 1 deletion staging/istio-helm-ztunnel/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: istio-helm-ztunnel
# 1.24.0 supports migration to ambient mesh mode from sidecar
# Tracker: https://jira.nutanix.com/browse/NCN-112389
version: 1.25.0
version: 1.25.1
appVersion: 1.29.0
description: Helm chart for deploying Istio ztunnel for ambient mesh mode
keywords:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,17 @@ spec:
resource: limits.cpu
divisor: "1"
{{- with .Values.env }}
{{/* CA_ADDRESS and XDS_ADDRESS are already rendered above; skip them here so a

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did we choose to ignore the override instead of Chart defaults? or are we saying that we shouldn't allow these env to be overridden

legacy override (ztunnel.env.CA_ADDRESS/XDS_ADDRESS) can't create a duplicate
env entry that strict server-side apply rejects. */}}
{{- $reserved := list "CA_ADDRESS" "XDS_ADDRESS" }}
{{- range $key, $val := . }}
{{- if not (has $key $reserved) }}
- name: {{ $key }}
value: "{{ $val }}"
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.peerCaCrl.enabled }}
- name: CRL_PATH
value: "/var/run/secrets/istio/crl/ca-crl.pem"
Expand Down
Loading