2022-04-11 09:52:32 +00:00
|
|
|
--- charts-original/templates/cilium-configmap.yaml
|
|
|
|
|
+++ charts/templates/cilium-configmap.yaml
|
2022-06-16 15:12:29 +00:00
|
|
|
@@ -1,3 +1,11 @@
|
|
|
|
|
+{{- if empty .Values.global.clusterCIDRv4 }}
|
|
|
|
|
+{{- $_ := set .Values.ipv4 "enabled" false -}}
|
|
|
|
|
+{{- end }}
|
|
|
|
|
+
|
|
|
|
|
+{{- if not (empty .Values.global.clusterCIDRv6) }}
|
|
|
|
|
+{{- $_ := set .Values.ipv6 "enabled" true -}}
|
|
|
|
|
+{{- end }}
|
|
|
|
|
+
|
|
|
|
|
{{- if and (.Values.agent) (not .Values.preflight.enabled) }}
|
|
|
|
|
{{- /* Default values with backwards compatibility */ -}}
|
|
|
|
|
{{- $defaultEnableCnpStatusUpdates := "true" -}}
|
|
|
|
|
@@ -199,7 +207,11 @@
|
2022-04-11 09:52:32 +00:00
|
|
|
|
|
|
|
|
# Enable IPv6 addressing. If enabled, all endpoints are allocated an IPv6
|
|
|
|
|
# address.
|
|
|
|
|
- enable-ipv6: {{ .Values.ipv6.enabled | quote }}
|
|
|
|
|
+{{- if coalesce .Values.global.clusterCIDRv6 .Values.ipv6.enabled }}
|
2022-04-11 13:54:46 +00:00
|
|
|
+ enable-ipv6: "true"
|
2022-04-11 09:52:32 +00:00
|
|
|
+{{ else }}
|
2022-04-11 13:54:46 +00:00
|
|
|
+ enable-ipv6: "false"
|
2022-04-11 09:52:32 +00:00
|
|
|
+{{- end }}
|
|
|
|
|
|
|
|
|
|
{{- if .Values.cleanState }}
|
|
|
|
|
# If a serious issue occurs during Cilium startup, this
|
2022-06-16 15:12:29 +00:00
|
|
|
@@ -361,8 +373,12 @@
|
|
|
|
|
enable-endpoint-routes: "true"
|
|
|
|
|
enable-local-node-route: "false"
|
|
|
|
|
{{- else }}
|
|
|
|
|
+{{- if not .Values.ipv4.enabled }}
|
|
|
|
|
+ tunnel: "disabled"
|
|
|
|
|
+{{- else }}
|
|
|
|
|
tunnel: {{ .Values.tunnel }}
|
|
|
|
|
{{- end }}
|
|
|
|
|
+{{- end }}
|
|
|
|
|
|
|
|
|
|
{{- if hasKey .Values "tunnelPort" }}
|
|
|
|
|
tunnel-port: "{{ .Values.tunnelPort }}"
|
