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 #148 from manuelbuil/encapNone 

Explicitly disable encapsulation in dual-stack env for Calico
pull/149/head
Michal Rostecki 2021-09-24 18:24:17 +02:00 committed by GitHub
parent 78916c18a9 02ea411afd
commit c2cc483e2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch
View File

@ -18,7 +18,7 @@
+{{ $myIP6Dict := dict "natOutgoing" "Enabled" "cidr" .Values.global.clusterCIDRv6 }} +{{ $myIP6Dict := dict "natOutgoing" "Enabled" "cidr" .Values.global.clusterCIDRv6 }}
+{{ $allIpPools := get .Values.installation.calicoNetwork "ipPools" }} +{{ $allIpPools := get .Values.installation.calicoNetwork "ipPools" }}
+{{ range $allIpPools }} +{{ range $allIpPools }}
+{{ $_ := unset . "encapsulation" }} +{{ $_ := set . "encapsulation" "None" }}
+{{ end }} +{{ end }}
+{{ $finalIpPoolList := append $allIpPools $myIP6Dict }} +{{ $finalIpPoolList := append $allIpPools $myIP6Dict }}
+{{ $calicoNetwork := get .Values.installation "calicoNetwork" }} +{{ $calicoNetwork := get .Values.installation "calicoNetwork" }}

2
packages/rke2-calico/package.yaml
View File

@ -1,5 +1,5 @@
url: https://github.com/projectcalico/calico/releases/download/v3.19.2/tigera-operator-v3.19.2-2.tgz url: https://github.com/projectcalico/calico/releases/download/v3.19.2/tigera-operator-v3.19.2-2.tgz
packageVersion: 04 packageVersion: 05
additionalCharts: additionalCharts:
- workingDir: charts-crd - workingDir: charts-crd
crdOptions: crdOptions: