From 79b88d304eb28d3639d7de8d3422f45952d61675 Mon Sep 17 00:00:00 2001
From: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
Date: Mon, 12 Feb 2024 12:18:32 +0100
Subject: [PATCH] Fix new image tag on Calico v3.27.0

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
---
 .../tigera-operator/00-uninstall.yaml.patch    | 18 ++++++++++++++++++
 .../generated-changes/patch/values.yaml.patch  |  5 ++---
 packages/rke2-calico/package.yaml              |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 packages/rke2-calico/generated-changes/patch/templates/tigera-operator/00-uninstall.yaml.patch

diff --git a/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/00-uninstall.yaml.patch b/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/00-uninstall.yaml.patch
new file mode 100644
index 00000000..8dac1807
--- /dev/null
+++ b/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/00-uninstall.yaml.patch
@@ -0,0 +1,18 @@
+--- charts-original/templates/tigera-operator/00-uninstall.yaml
++++ charts/templates/tigera-operator/00-uninstall.yaml
+@@ -2,7 +2,7 @@
+ kind: Job
+ metadata:
+   name: tigera-operator-uninstall
+-  namespace: {{.Release.Namespace}}
++  namespace: tigera-operator
+   labels:
+     k8s-app: tigera-operator-uninstall
+     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+@@ -34,5 +34,5 @@
+       serviceAccountName: tigera-operator
+       containers:
+       - name: cleanup-job
+-        image: {{ template "tigera-operator.image" .Values.tigeraOperator}}
++        image: {{ template "tigera-operator.image" . }}
+         args: ["-pre-delete"]
diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
index 85f974fc..18a4ba0b 100644
--- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch
+++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
@@ -31,7 +31,7 @@
  
  certs:
    node:
-@@ -51,11 +64,30 @@
+@@ -51,11 +64,28 @@
  
  # Image and registry configuration for the tigera/operator pod.
  tigeraOperator:
@@ -45,8 +45,7 @@
 +  image: rancher/mirrored-calico-ctl
    tag: v3.27.0
  
- kubeletVolumePluginPath: /var/lib/kubelet
-+
+-kubeletVolumePluginPath: /var/lib/kubelet
 +global:
 +  systemDefaultRegistry: ""
 +  clusterCIDRv4: ""
diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml
index 625f0f57..79eee925 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.27.0/tigera-operator-v3.27.0.tgz
-packageVersion: 00
+packageVersion: 01
 additionalCharts:
   - workingDir: charts-crd
     crdOptions: