From 76b39c3da71be07936733dcc7334028e9a80cede Mon Sep 17 00:00:00 2001
From: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
Date: Thu, 19 May 2022 21:40:29 +0200
Subject: [PATCH] Updated calico to 3.23.1

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
---
 .../generated-changes/overlay/templates/felixconfig.yaml | 1 +
 .../rke2-calico/generated-changes/patch/Chart.yaml.patch | 2 +-
 .../tigera-operator/01-imagepullsecret.yaml.patch        | 9 +++++++--
 .../generated-changes/patch/values.yaml.patch            | 7 ++++---
 packages/rke2-calico/package.yaml                        | 4 ++--
 packages/rke2-calico/templates/crd-template/Chart.yaml   | 2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml b/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml
index 4194c97..c203041 100644
--- a/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml
+++ b/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml
@@ -5,3 +5,4 @@ metadata:
 spec:
   wireguardEnabled: {{ .Values.felixConfiguration.wireguardEnabled }}
   featureDetectOverride: {{ .Values.felixConfiguration.featureDetectOverride }}
+  healthPort: {{ .Values.felixConfiguration.healthPort }}
diff --git a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch
index 8ba17b6..af77301 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.23.0
+ version: v3.23.1
 +annotations:
 +  catalog.cattle.io/namespace: tigera-operator
diff --git a/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/01-imagepullsecret.yaml.patch b/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/01-imagepullsecret.yaml.patch
index e205224..29029d5 100644
--- a/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/01-imagepullsecret.yaml.patch
+++ b/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/01-imagepullsecret.yaml.patch
@@ -1,10 +1,15 @@
 --- charts-original/templates/tigera-operator/01-imagepullsecret.yaml
 +++ charts/templates/tigera-operator/01-imagepullsecret.yaml
-@@ -6,7 +6,7 @@
+@@ -1,4 +1,3 @@
+-{{- $ns := .Release.Namespace }}
+ {{- $envAll := . }}
+ {{- if .Values.imagePullSecrets }}
+ 
+@@ -7,7 +6,7 @@
  kind: Secret
  metadata:
    name: {{ $key }}
--  namespace: {{.Release.Namespace}}
+-  namespace: {{ $ns }}
 +  namespace: tigera-operator
  data:
    .dockerconfigjson: {{ $value | b64enc }}
diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
index f92d0c4..d3ee670 100644
--- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch
+++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
@@ -30,19 +30,19 @@
  
  certs:
    node:
-@@ -22,9 +39,24 @@
+@@ -22,9 +39,25 @@
  
  # Configuration for the tigera operator
  tigeraOperator:
 -  image: tigera/operator
 +  image: rancher/mirrored-calico-operator
-   version: v1.27.0
+   version: v1.27.1
 -  registry: quay.io
 +  registry: docker.io
  calicoctl:
 -  image: docker.io/calico/ctl
 +  image: rancher/mirrored-calico-ctl
-   tag: v3.23.0
+   tag: v3.23.1
 +
 +global:
 +  systemDefaultRegistry: ""
@@ -58,3 +58,4 @@
 +  wireguardEnabled: false
 +  # Config required to fix RKE2 issue #1541
 +  featureDetectOverride: "ChecksumOffloadBroken=true"
++  healthPort: 9099
diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml
index 69b9eea..b00e0a3 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.23.0/tigera-operator-v3.23.0.tgz
-packageVersion: 04
+url: https://github.com/projectcalico/calico/releases/download/v3.23.1/tigera-operator-v3.23.1.tgz
+packageVersion: 01
 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 8358141..121cc8c 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.23.0
+version: v3.23.1
 description: Installs the CRDs for rke2-calico
 name: rke2-calico-crd
 type: application