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 #205 from manuelbuil/canal-fix 

Remove dual-stack logic from 1.19&1.20 canal chart
pull/206/head
Manuel Buil 2021-12-23 17:35:13 +01:00 committed by GitHub
parent 86939328e4 fb75694a15
commit 45a8ddf9ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/rke2-canal-1.19-1.20/charts/templates/config.yaml vendored
View File

@ -60,11 +60,7 @@ data:
# Flannel network configuration. Mounted into the flannel container.
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": true,
{{- end }}
"Network": {{ coalesce .Values.global.clusterCIDR .Values.podCidr | quote }},
"Backend": {
"Type": {{ .Values.flannel.backend | quote }}
}

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

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

2
packages/rke2-canal-1.19-1.20/package.yaml vendored
View File

@ -1,2 +1,2 @@
url: local
packageVersion: 04
packageVersion: 05