Merge pull request #112 from manuelbuil/calico_systemDefaultRegistry

Bug: Propagate global.systemDefaultRegistry to calico images
2021-07-07 10:17:46 +02:00 · 2021-07-07 10:17:46 +02:00 · d799ec4a50
parent 86cd804598 912b7362c7
commit d799ec4a50
2 changed files with 5 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
@ -1,9 +1,12 @@
 --- charts-original/templates/crs/custom-resources.yaml
 +++ charts/templates/crs/custom-resources.yaml
-@@ -6,6 +6,10 @@
+@@ -6,6 +6,13 @@
 {{ $secrets = append $secrets $item }}
 {{ end }}
 {{ $_ := 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 }}
 +{{ $defaultCIDR := get $defaultipPools "cidr" }}
 +{{ $finalCIDR := coalesce .Values.global.clusterCIDR $defaultCIDR }}
--- 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.1/tigera-operator-v3.19.1-2.tgz
-packageVersion: 06
+packageVersion: 07
 additionalCharts:
  - workingDir: charts-crd
    crdOptions: