Merge pull request #131 from manuelbuil/update-calico

Update calico chart to 3.19.2
pull/132/head
Manuel Buil 2021-08-10 10:37:49 +02:00 committed by GitHub
commit 27e277183b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions

View File

@ -2,11 +2,10 @@
+++ charts/Chart.yaml +++ charts/Chart.yaml
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
apiVersion: v2 apiVersion: v2
-appVersion: v3.19.1-e9e1e40ca appVersion: v3.19.2
+appVersion: v3.19.1-2
description: Installs the Tigera operator for Calico description: Installs the Tigera operator for Calico
-name: tigera-operator -name: tigera-operator
+name: rke2-calico +name: rke2-calico
version: v3.19 version: v3.19.2-2
+annotations: +annotations:
+ catalog.cattle.io/namespace: tigera-operator + catalog.cattle.io/namespace: tigera-operator

View File

@ -1,6 +1,6 @@
--- charts-original/values.yaml --- charts-original/values.yaml
+++ charts/values.yaml +++ charts/values.yaml
@@ -1,8 +1,25 @@ @@ -1,8 +1,24 @@
imagePullSecrets: {} imagePullSecrets: {}
installation: installation:
@ -22,23 +22,22 @@
+ blockSize: 24 + blockSize: 24
+ imagePath: "rancher" + imagePath: "rancher"
+ imagePrefix: "mirrored-calico-" + imagePrefix: "mirrored-calico-"
+
certs: certs:
node: node:
@@ -17,9 +34,16 @@ @@ -17,9 +33,16 @@
# Configuration for the tigera operator # Configuration for the tigera operator
tigeraOperator: tigeraOperator:
- image: tigera/operator - image: tigera/operator
+ image: rancher/mirrored-calico-operator + image: rancher/mirrored-calico-operator
version: v1.17.4 version: v1.17.6
- registry: quay.io - registry: quay.io
+ registry: docker.io + registry: docker.io
calicoctl: calicoctl:
- image: quay.io/docker.io/calico/ctl - image: quay.io/docker.io/calico/ctl
+ image: rancher/mirrored-calico-ctl + image: rancher/mirrored-calico-ctl
tag: v3.19.1 tag: v3.19.2
+ +
+global: +global:
+ systemDefaultRegistry: "" + systemDefaultRegistry: ""

View File

@ -1,5 +1,5 @@
url: https://github.com/projectcalico/calico/releases/download/v3.19.1/tigera-operator-v3.19.1-2.tgz url: https://github.com/projectcalico/calico/releases/download/v3.19.2/tigera-operator-v3.19.2-2.tgz
packageVersion: 08 packageVersion: 01
additionalCharts: additionalCharts:
- workingDir: charts-crd - workingDir: charts-crd
crdOptions: crdOptions:

View File

@ -1,5 +1,5 @@
apiVersion: v1 apiVersion: v1
version: v1.0.0 version: v1.0.1
description: Installs the CRDs for rke2-calico description: Installs the CRDs for rke2-calico
name: rke2-calico-crd name: rke2-calico-crd
type: application type: application