mirror of https://git.rancher.io/rke2-charts
Update Calico with the newer version
This version fixes the problems we had: 1 - Image prefix no possible 2 - Images on 3.19.0 instead of 3.19.1 Signed-off-by: Manuel Buil <mbuil@suse.com>pull/99/head
parent
12275df431
commit
e41a9179c3
|
@ -2,10 +2,11 @@
|
||||||
+++ charts/Chart.yaml
|
+++ charts/Chart.yaml
|
||||||
@@ -1,5 +1,7 @@
|
@@ -1,5 +1,7 @@
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: v3.19.1
|
-appVersion: v3.19.1-e9e1e40ca
|
||||||
|
+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.1-1
|
version: v3.19
|
||||||
+annotations:
|
+annotations:
|
||||||
+ catalog.cattle.io/namespace: tigera-operator
|
+ catalog.cattle.io/namespace: tigera-operator
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- charts-original/values.yaml
|
--- charts-original/values.yaml
|
||||||
+++ charts/values.yaml
|
+++ charts/values.yaml
|
||||||
@@ -1,8 +1,21 @@
|
@@ -1,8 +1,24 @@
|
||||||
imagePullSecrets: {}
|
imagePullSecrets: {}
|
||||||
|
|
||||||
installation:
|
installation:
|
||||||
|
@ -19,16 +19,19 @@
|
||||||
+ - natOutgoing: Enabled
|
+ - natOutgoing: Enabled
|
||||||
+ encapsulation: VXLAN
|
+ encapsulation: VXLAN
|
||||||
+ cidr: 10.42.0.0/16
|
+ cidr: 10.42.0.0/16
|
||||||
|
+ imagePath: "rancher"
|
||||||
|
+ imagePrefix: "mirrored-calico-"
|
||||||
|
+
|
||||||
|
|
||||||
certs:
|
certs:
|
||||||
node:
|
node:
|
||||||
@@ -17,9 +30,12 @@
|
@@ -17,9 +33,12 @@
|
||||||
|
|
||||||
# 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.2
|
version: v1.17.4
|
||||||
- registry: quay.io
|
- registry: quay.io
|
||||||
+ registry: docker.io
|
+ registry: docker.io
|
||||||
calicoctl:
|
calicoctl:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
url: https://github.com/projectcalico/calico/releases/download/v3.19.1/tigera-operator-v3.19.1-1.tgz
|
url: https://github.com/projectcalico/calico/releases/download/v3.19.1/tigera-operator-v3.19.1-2.tgz
|
||||||
packageVersion: 05
|
packageVersion: 06
|
||||||
additionalCharts:
|
additionalCharts:
|
||||||
- workingDir: charts-crd
|
- workingDir: charts-crd
|
||||||
crdOptions:
|
crdOptions:
|
||||||
|
|
Loading…
Reference in New Issue