andata
/
rke2-charts
mirror of https://git.rancher.io/rke2-charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix canal network configuration when ipv6 not enabled 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/155/head
Brad Davidson 2021-09-30 14:53:35 -07:00 committed by Brad Davidson
parent 378155b673
commit 1b70ad7d67
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/rke2-canal/charts/templates/_helpers.tpl
View File

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

4
packages/rke2-canal/charts/templates/config.yaml
View File

@ -61,8 +61,10 @@ data:
net-conf.json: | net-conf.json: |
{ {
"Network": {{ coalesce .Values.global.clusterCIDRv4 .Values.podCidr | quote }}, "Network": {{ coalesce .Values.global.clusterCIDRv4 .Values.podCidr | quote }},
{{- if coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 }}
"IPv6Network": {{ coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 | quote }}, "IPv6Network": {{ coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 | quote }},
"EnableIPv6": {{ template "enableIPv6?" . }}, "EnableIPv6": true,
{{- end }}
"Backend": { "Backend": {
"Type": {{ .Values.flannel.backend | quote }} "Type": {{ .Values.flannel.backend | quote }}
} }

2
packages/rke2-canal/package.yaml
View File

@ -1,4 +1,4 @@
url: local url: local
packageVersion: 09 packageVersion: 10
# 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