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 #112 from manuelbuil/calico_systemDefaultRegistry 

Bug: Propagate global.systemDefaultRegistry to calico images
pull/113/head
Manuel Buil 2021-07-07 10:17:46 +02:00 committed by GitHub
parent 86cd804598 912b7362c7
commit d799ec4a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,12 @@
--- charts-original/templates/crs/custom-resources.yaml --- charts-original/templates/crs/custom-resources.yaml
+++ charts/templates/crs/custom-resources.yaml +++ charts/templates/crs/custom-resources.yaml
@@ -6,6 +6,10 @@ @@ -6,6 +6,13 @@
{{ $secrets = append $secrets $item }} {{ $secrets = append $secrets $item }}
{{ end }} {{ end }}
{{ $_ := set $installSpec "imagePullSecrets" $secrets }} {{ $_ := set $installSpec "imagePullSecrets" $secrets }}
+{{ $defaultRegistry := get $installSpec "registry" }}
+{{ $finalRegistry := coalesce .Values.global.systemDefaultRegistry $defaultRegistry }}
+{{ $_ := set $installSpec "registry" $finalRegistry }}
+{{ $defaultipPools := get .Values.installation.calicoNetwork "ipPools" | first }} +{{ $defaultipPools := get .Values.installation.calicoNetwork "ipPools" | first }}
+{{ $defaultCIDR := get $defaultipPools "cidr" }} +{{ $defaultCIDR := get $defaultipPools "cidr" }}
+{{ $finalCIDR := coalesce .Values.global.clusterCIDR $defaultCIDR }} +{{ $finalCIDR := coalesce .Values.global.clusterCIDR $defaultCIDR }}

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

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