From 02ea411afdcf46c35ce45d923c18a78327a4046b Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 24 Sep 2021 09:50:17 +0200 Subject: [PATCH] Explicitely disable encapsulation in dual-stack Signed-off-by: Manuel Buil --- .../patch/templates/crs/custom-resources.yaml.patch | 2 +- packages/rke2-calico/package.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch b/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch index 10a65b1..58a69c4 100644 --- a/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch @@ -18,7 +18,7 @@ +{{ $myIP6Dict := dict "natOutgoing" "Enabled" "cidr" .Values.global.clusterCIDRv6 }} +{{ $allIpPools := get .Values.installation.calicoNetwork "ipPools" }} +{{ range $allIpPools }} -+{{ $_ := unset . "encapsulation" }} ++{{ $_ := set . "encapsulation" "None" }} +{{ end }} +{{ $finalIpPoolList := append $allIpPools $myIP6Dict }} +{{ $calicoNetwork := get .Values.installation "calicoNetwork" }} diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml index 837b5fc..cce9567 100644 --- a/packages/rke2-calico/package.yaml +++ b/packages/rke2-calico/package.yaml @@ -1,5 +1,5 @@ url: https://github.com/projectcalico/calico/releases/download/v3.19.2/tigera-operator-v3.19.2-2.tgz -packageVersion: 04 +packageVersion: 05 additionalCharts: - workingDir: charts-crd crdOptions: