Skip to content

Commit

Permalink
set nodeAddressAutodetectionV4.firstFound explicitly
Browse files Browse the repository at this point in the history
in installation.CalicoNetwork

If not explicitly, it is set by the Tigera Operator which prevents it from being updated through Helm or the Rancher UI.

update calico to v3.26.3
  • Loading branch information
thomasferrandiz committed Nov 15, 2023
1 parent f88d1b5 commit e3e7ce8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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 }}
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
4 changes: 2 additions & 2 deletions packages/rke2-calico/package.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-calico/templates/crd-template/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit e3e7ce8

Please sign in to comment.