diff --git a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch index 8227bef..d9d21cb 100644 --- a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch @@ -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 diff --git a/packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_apiservers_crd.yaml.patch b/packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_apiservers_crd.yaml.patch new file mode 100644 index 0000000..88dd81b --- /dev/null +++ b/packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_apiservers_crd.yaml.patch @@ -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: diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch index 835f3c7..e83ea69 100644 --- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch @@ -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: "" diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml index cce9567..9f94fcb 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.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: diff --git a/packages/rke2-calico/templates/crd-template/Chart.yaml b/packages/rke2-calico/templates/crd-template/Chart.yaml index 0a09765..023a708 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.1 +version: v1.0.2 description: Installs the CRDs for rke2-calico name: rke2-calico-crd type: application