diff --git a/packages/rke2-canal/charts/templates/_helpers.tpl b/packages/rke2-canal/charts/templates/_helpers.tpl index bccf2cb..b647c75 100644 --- a/packages/rke2-canal/charts/templates/_helpers.tpl +++ b/packages/rke2-canal/charts/templates/_helpers.tpl @@ -5,9 +5,3 @@ {{- "" -}} {{- end -}} {{- end -}} - -{{- define "enableIPv6?" -}} -{{- $cidrv6 := coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 -}} -{{- ternary "false" "true" (empty .Values.global.clusterCIDRv6) -}} -{{- end -}} - diff --git a/packages/rke2-canal/charts/templates/config.yaml b/packages/rke2-canal/charts/templates/config.yaml index fbc776a..1a005ca 100644 --- a/packages/rke2-canal/charts/templates/config.yaml +++ b/packages/rke2-canal/charts/templates/config.yaml @@ -61,8 +61,10 @@ data: net-conf.json: | { "Network": {{ coalesce .Values.global.clusterCIDRv4 .Values.podCidr | quote }}, +{{- if coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 }} "IPv6Network": {{ coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 | quote }}, - "EnableIPv6": {{ template "enableIPv6?" . }}, + "EnableIPv6": true, +{{- end }} "Backend": { "Type": {{ .Values.flannel.backend | quote }} } diff --git a/packages/rke2-canal/package.yaml b/packages/rke2-canal/package.yaml index 2b56338..2d96c0f 100644 --- a/packages/rke2-canal/package.yaml +++ b/packages/rke2-canal/package.yaml @@ -1,4 +1,4 @@ url: local -packageVersion: 09 +packageVersion: 10 # This repository does not use releaseCandidateVersions, so you can leave this as 00. releaseCandidateVersion: 00