Merge pull request #148 from manuelbuil/encapNone

Explicitly disable encapsulation in dual-stack env for Calico
2021-09-24 18:24:17 +02:00 · 2021-09-24 18:24:17 +02:00 · c2cc483e2f
parent 78916c18a9 02ea411afd
commit c2cc483e2f
2 changed files with 2 additions and 2 deletions
--- 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" }}
--- 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: