From 80c1dceacdb7b1fd1a6e0ed2c718fd66f58dd281 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 6 May 2022 10:54:43 +0200 Subject: [PATCH] Update calico to 3.22.2 Signed-off-by: Manuel Buil --- .../rke2-calico/generated-changes/patch/Chart.yaml.patch | 2 +- .../rke2-calico/generated-changes/patch/values.yaml.patch | 6 +++--- packages/rke2-calico/package.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch index 862f79f..a14d8f6 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.22.1 + version: v3.22.2 +annotations: + catalog.cattle.io/namespace: tigera-operator diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch index f1db22a..d46c428 100644 --- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch @@ -34,15 +34,15 @@ # Configuration for the tigera operator tigeraOperator: - image: tigera/operator -- version: v1.25.2 +- version: v1.25.7 - registry: quay.io + image: rancher/mirrored-calico-operator -+ version: v1.25.3 ++ version: v1.25.8 + registry: docker.io calicoctl: - image: docker.io/calico/ctl + image: rancher/mirrored-calico-ctl - tag: v3.22.1 + tag: v3.22.2 + +global: + systemDefaultRegistry: "" diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml index 9b8cd08..7ea440a 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.22.1/tigera-operator-v3.22.1.tgz -packageVersion: 02 +url: https://github.com/projectcalico/calico/releases/download/v3.22.2/tigera-operator-v3.22.2.tgz +packageVersion: 01 additionalCharts: - workingDir: charts-crd crdOptions: