mirror of https://git.rancher.io/rke2-charts
Update calico to 1.20.1 version
This version works with k8s 1.22 Signed-off-by: Manuel Buil <mbuil@suse.com>pull/154/head
parent
faa7277df0
commit
97706ffd8a
|
@ -2,10 +2,10 @@
|
||||||
+++ charts/Chart.yaml
|
+++ charts/Chart.yaml
|
||||||
@@ -1,5 +1,7 @@
|
@@ -1,5 +1,7 @@
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: v3.19.2
|
appVersion: v3.20.1
|
||||||
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.2-2
|
version: v3.20.1
|
||||||
+annotations:
|
+annotations:
|
||||||
+ catalog.cattle.io/namespace: tigera-operator
|
+ catalog.cattle.io/namespace: tigera-operator
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- charts-original/crds/operator.tigera.io_apiservers_crd.yaml
|
||||||
|
+++ charts/crds/operator.tigera.io_apiservers_crd.yaml
|
||||||
|
@@ -2,8 +2,6 @@
|
||||||
|
kind: CustomResourceDefinition
|
||||||
|
metadata:
|
||||||
|
name: apiservers.operator.tigera.io
|
||||||
|
- annotations:
|
||||||
|
- helm.sh/hook: crd-install
|
||||||
|
spec:
|
||||||
|
group: operator.tigera.io
|
||||||
|
names:
|
|
@ -23,21 +23,21 @@
|
||||||
+ imagePath: "rancher"
|
+ imagePath: "rancher"
|
||||||
+ imagePrefix: "mirrored-calico-"
|
+ imagePrefix: "mirrored-calico-"
|
||||||
|
|
||||||
certs:
|
apiServer:
|
||||||
node:
|
enabled: true
|
||||||
@@ -17,9 +33,23 @@
|
@@ -20,9 +36,23 @@
|
||||||
|
|
||||||
# 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.6
|
version: v1.20.3
|
||||||
- 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.2
|
tag: v3.20.1
|
||||||
+
|
+
|
||||||
+global:
|
+global:
|
||||||
+ systemDefaultRegistry: ""
|
+ systemDefaultRegistry: ""
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
url: https://github.com/projectcalico/calico/releases/download/v3.19.2/tigera-operator-v3.19.2-2.tgz
|
url: https://github.com/projectcalico/calico/releases/download/v3.20.1/tigera-operator-v3.20.1.tgz
|
||||||
packageVersion: 05
|
packageVersion: 01
|
||||||
additionalCharts:
|
additionalCharts:
|
||||||
- workingDir: charts-crd
|
- workingDir: charts-crd
|
||||||
crdOptions:
|
crdOptions:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
version: v1.0.1
|
version: v1.0.2
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue