From e3e7ce8f077315f688ad27eb678c3dd9b29f0778 Mon Sep 17 00:00:00 2001
From: Thomas Ferrandiz <thomas.ferrandiz@suse.com>
Date: Tue, 14 Nov 2023 18:28:15 +0000
Subject: [PATCH] set nodeAddressAutodetectionV4.firstFound explicitly 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
---
 .../rke2-calico/generated-changes/patch/Chart.yaml.patch   | 2 +-
 .../patch/templates/crs/custom-resources.yaml.patch        | 7 ++++++-
 .../rke2-calico/generated-changes/patch/values.yaml.patch  | 4 ++--
 packages/rke2-calico/package.yaml                          | 4 ++--
 packages/rke2-calico/templates/crd-template/Chart.yaml     | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch
index 736905a88..251b6f0f7 100644
--- a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch
+++ b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch
@@ -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
diff --git 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
index 92e083716..74db987c6 100644
--- 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,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
diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
index a023199de..3e28aedf5 100644
--- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch
+++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
@@ -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: ""
diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml
index 51555ce2e..ab562701c 100644
--- 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.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:
diff --git a/packages/rke2-calico/templates/crd-template/Chart.yaml b/packages/rke2-calico/templates/crd-template/Chart.yaml
index 1f7c8b2f8..82ade7246 100644
--- a/packages/rke2-calico/templates/crd-template/Chart.yaml
+++ b/packages/rke2-calico/templates/crd-template/Chart.yaml
@@ -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