mirror of https://git.rancher.io/rke2-charts
Merge pull request #382 from thomasferrandiz/calico-nodeAddressAutodetectionV4
set nodeAddressAutodetectionV4.firstFound explicitly in calico chart and update calico to v3.26.3pull/383/head
commit
6a49b02b93
|
@ -10,6 +10,6 @@
|
|||
- https://github.com/projectcalico/calico/tree/master/calico/_includes/charts/tigera-operator
|
||||
- https://github.com/tigera/operator
|
||||
- https://github.com/projectcalico/calico
|
||||
version: v3.26.1
|
||||
version: v3.26.3
|
||||
+annotations:
|
||||
+ catalog.cattle.io/namespace: tigera-operator
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- charts-original/templates/crs/custom-resources.yaml
|
||||
+++ charts/templates/crs/custom-resources.yaml
|
||||
@@ -6,6 +6,28 @@
|
||||
@@ -6,6 +6,33 @@
|
||||
{{ $secrets = append $secrets $item }}
|
||||
{{ end }}
|
||||
{{ $_ := set $installSpec "imagePullSecrets" $secrets }}
|
||||
|
@ -25,6 +25,11 @@
|
|||
+{{ $finalIpPoolList := list $myIP6Dict }}
|
||||
+{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }}
|
||||
+{{ end }}
|
||||
+{{ if empty .Values.installation.calicoNetwork.nodeAddressAutodetectionV4 }}
|
||||
+{{ $calicoNetwork := get .Values.installation "calicoNetwork" }}
|
||||
+{{ $autodetect := dict "firstFound" true }}
|
||||
+{{ $_ := set $calicoNetwork "nodeAddressAutodetectionV4" $autodetect }}
|
||||
+{{ end }}
|
||||
+{{ end }}
|
||||
|
||||
apiVersion: operator.tigera.io/v1
|
||||
|
|
|
@ -32,13 +32,13 @@
|
|||
tigeraOperator:
|
||||
- image: tigera/operator
|
||||
+ image: rancher/mirrored-calico-operator
|
||||
version: v1.30.4
|
||||
version: v1.30.7
|
||||
- registry: quay.io
|
||||
+ registry: docker.io
|
||||
calicoctl:
|
||||
- image: docker.io/calico/ctl
|
||||
+ image: rancher/mirrored-calico-ctl
|
||||
tag: v3.26.1
|
||||
tag: v3.26.3
|
||||
+
|
||||
+global:
|
||||
+ systemDefaultRegistry: ""
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
url: https://github.com/projectcalico/calico/releases/download/v3.26.1/tigera-operator-v3.26.1.tgz
|
||||
packageVersion: 01
|
||||
url: https://github.com/projectcalico/calico/releases/download/v3.26.3/tigera-operator-v3.26.3.tgz
|
||||
packageVersion: 00
|
||||
additionalCharts:
|
||||
- workingDir: charts-crd
|
||||
crdOptions:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
apiVersion: v1
|
||||
version: v3.26.1
|
||||
version: v3.26.3
|
||||
description: Installs the CRDs for rke2-calico
|
||||
name: rke2-calico-crd
|
||||
type: application
|
||||
|
|
Loading…
Reference in New Issue