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

Merge pull request #150 from manuelbuil/fix_dual_stack_canal 

Provide dual-stack support for canal
pull/151/head
Manuel Buil 2021-09-29 09:41:48 +02:00 committed by GitHub
parent c2cc483e2f 8ad6d4f0ed
commit 3440cd9e50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 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,3 +5,9 @@
{{- "" -}} {{- "" -}}
{{- 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

@ -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 }}
} }

2
packages/rke2-canal/charts/values.yaml
View File

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

2
packages/rke2-canal/package.yaml
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