mirror of https://git.rancher.io/rke2-charts
Merge pull request #154 from manuelbuil/update_calico_version
Update calico to 1.20.1 versionpull/157/head
commit
5d2e12caa9
|
@ -2,10 +2,10 @@
|
|||
+++ charts/Chart.yaml
|
||||
@@ -1,5 +1,7 @@
|
||||
apiVersion: v2
|
||||
appVersion: v3.19.2
|
||||
appVersion: v3.20.1
|
||||
description: Installs the Tigera operator for Calico
|
||||
-name: tigera-operator
|
||||
+name: rke2-calico
|
||||
version: v3.19.2-2
|
||||
version: v3.20.1
|
||||
+annotations:
|
||||
+ 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"
|
||||
+ imagePrefix: "mirrored-calico-"
|
||||
|
||||
certs:
|
||||
node:
|
||||
@@ -17,9 +33,23 @@
|
||||
apiServer:
|
||||
enabled: true
|
||||
@@ -20,9 +36,23 @@
|
||||
|
||||
# Configuration for the tigera operator
|
||||
tigeraOperator:
|
||||
- image: tigera/operator
|
||||
+ image: rancher/mirrored-calico-operator
|
||||
version: v1.17.6
|
||||
version: v1.20.3
|
||||
- registry: quay.io
|
||||
+ registry: docker.io
|
||||
calicoctl:
|
||||
- image: quay.io/docker.io/calico/ctl
|
||||
+ image: rancher/mirrored-calico-ctl
|
||||
tag: v3.19.2
|
||||
tag: v3.20.1
|
||||
+
|
||||
+global:
|
||||
+ systemDefaultRegistry: ""
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
url: https://github.com/projectcalico/calico/releases/download/v3.19.2/tigera-operator-v3.19.2-2.tgz
|
||||
packageVersion: 05
|
||||
url: https://github.com/projectcalico/calico/releases/download/v3.20.1/tigera-operator-v3.20.1.tgz
|
||||
packageVersion: 01
|
||||
additionalCharts:
|
||||
- workingDir: charts-crd
|
||||
crdOptions:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
apiVersion: v1
|
||||
version: v1.0.1
|
||||
version: v1.0.2
|
||||
description: Installs the CRDs for rke2-calico
|
||||
name: rke2-calico-crd
|
||||
type: application
|
||||
|
|
Loading…
Reference in New Issue