Provide dual-stack support for canal

Signed-off-by: Manuel Buil <mbuil@suse.com>
pull/150/head
Manuel Buil 2021-09-28 16:45:31 +02:00
parent c2cc483e2f
commit 8ad6d4f0ed
4 changed files with 12 additions and 2 deletions

View File

@ -5,3 +5,9 @@
{{- "" -}} {{- "" -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- define "enableIPv6?" -}}
{{- $cidrv6 := coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 -}}
{{- ternary "false" "true" (empty .Values.global.clusterCIDRv6) -}}
{{- end -}}

View File

@ -60,7 +60,9 @@ data:
# Flannel network configuration. Mounted into the flannel container. # Flannel network configuration. Mounted into the flannel container.
net-conf.json: | net-conf.json: |
{ {
"Network": {{ coalesce .Values.global.clusterCIDR .Values.podCidr | quote }}, "Network": {{ coalesce .Values.global.clusterCIDRv4 .Values.podCidr | quote }},
"IPv6Network": {{ coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 | quote }},
"EnableIPv6": {{ template "enableIPv6?" . }},
"Backend": { "Backend": {
"Type": {{ .Values.flannel.backend | quote }} "Type": {{ .Values.flannel.backend | quote }}
} }

View File

@ -78,3 +78,5 @@ calico:
global: global:
systemDefaultRegistry: "" systemDefaultRegistry: ""
clusterCIDRv4: ""
clusterCIDRv6: ""

View File

@ -1,4 +1,4 @@
url: local url: local
packageVersion: 07 packageVersion: 08
# This repository does not use releaseCandidateVersions, so you can leave this as 00. # This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00 releaseCandidateVersion: 00