From fb75694a15da622d557b1da44d45f1ef83f81edc Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Thu, 23 Dec 2021 17:12:20 +0100 Subject: [PATCH] Remove dual-stack logic from 1.19&1.20 canal chart Signed-off-by: Manuel Buil --- packages/rke2-canal-1.19-1.20/charts/templates/config.yaml | 6 +----- packages/rke2-canal-1.19-1.20/charts/values.yaml | 2 -- packages/rke2-canal-1.19-1.20/package.yaml | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/rke2-canal-1.19-1.20/charts/templates/config.yaml b/packages/rke2-canal-1.19-1.20/charts/templates/config.yaml index 1a005ca..7229863 100644 --- a/packages/rke2-canal-1.19-1.20/charts/templates/config.yaml +++ b/packages/rke2-canal-1.19-1.20/charts/templates/config.yaml @@ -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 }} } diff --git a/packages/rke2-canal-1.19-1.20/charts/values.yaml b/packages/rke2-canal-1.19-1.20/charts/values.yaml index c4f2430..0d216c5 100644 --- a/packages/rke2-canal-1.19-1.20/charts/values.yaml +++ b/packages/rke2-canal-1.19-1.20/charts/values.yaml @@ -78,5 +78,3 @@ calico: global: systemDefaultRegistry: "" - clusterCIDRv4: "" - clusterCIDRv6: "" diff --git a/packages/rke2-canal-1.19-1.20/package.yaml b/packages/rke2-canal-1.19-1.20/package.yaml index b2f6429..ae382fd 100644 --- a/packages/rke2-canal-1.19-1.20/package.yaml +++ b/packages/rke2-canal-1.19-1.20/package.yaml @@ -1,2 +1,2 @@ url: local -packageVersion: 04 +packageVersion: 05