From 9601493243c460d835dddd4dda5b4c8da3e6f21a Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 10 Aug 2021 07:58:41 +0000 Subject: [PATCH] Update calico chart with the latest version Signed-off-by: Manuel Buil --- .../rke2-calico/generated-changes/patch/Chart.yaml.patch | 5 ++--- .../generated-changes/patch/values.yaml.patch | 9 ++++----- packages/rke2-calico/package.yaml | 4 ++-- packages/rke2-calico/templates/crd-template/Chart.yaml | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch index 1150d061f..8227bef8b 100644 --- a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch @@ -2,11 +2,10 @@ +++ charts/Chart.yaml @@ -1,5 +1,7 @@ apiVersion: v2 --appVersion: v3.19.1-e9e1e40ca -+appVersion: v3.19.1-2 + appVersion: v3.19.2 description: Installs the Tigera operator for Calico -name: tigera-operator +name: rke2-calico - version: v3.19 + version: v3.19.2-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 6fc617ce2..8852f63f7 100644 --- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/values.yaml +++ charts/values.yaml -@@ -1,8 +1,25 @@ +@@ -1,8 +1,24 @@ imagePullSecrets: {} installation: @@ -22,23 +22,22 @@ + blockSize: 24 + imagePath: "rancher" + imagePrefix: "mirrored-calico-" -+ certs: node: -@@ -17,9 +34,16 @@ +@@ -17,9 +33,16 @@ # Configuration for the tigera operator tigeraOperator: - image: tigera/operator + image: rancher/mirrored-calico-operator - version: v1.17.4 + version: v1.17.6 - registry: quay.io + registry: docker.io calicoctl: - image: quay.io/docker.io/calico/ctl + image: rancher/mirrored-calico-ctl - tag: v3.19.1 + tag: v3.19.2 + +global: + systemDefaultRegistry: "" diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml index 76c58f160..e56880656 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.19.1/tigera-operator-v3.19.1-2.tgz -packageVersion: 08 +url: https://github.com/projectcalico/calico/releases/download/v3.19.2/tigera-operator-v3.19.2-2.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 66d136522..0a0976509 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: v1.0.0 +version: v1.0.1 description: Installs the CRDs for rke2-calico name: rke2-calico-crd type: application