Merge pull request #218 from rbrtbnfgl/update-calico-v3.22.0

Updated calico to version 3.22.0

packages/rke2-calico/generated-changes/patch/Chart.yaml.patch

@@ -1,11 +1,15 @@
 --- charts-original/Chart.yaml
 +++ charts/Chart.yaml
-@@ -1,5 +1,7 @@
+@@ -3,9 +3,11 @@
- apiVersion: v2
- appVersion: v3.21.4
  description: Installs the Tigera operator for Calico
+ home: https://projectcalico.docs.tigera.io/about/about-calico
+ icon: https://projectcalico.docs.tigera.io/images/felix_icon.png
 -name: tigera-operator
 +name: rke2-calico
- version: v3.21.4
+ sources:
+ - https://github.com/projectcalico/calico/tree/master/calico/_includes/charts/tigera-operator
+ - https://github.com/tigera/operator
+ - https://github.com/projectcalico/calico
+ version: v3.22.0
 +annotations:
 +  catalog.cattle.io/namespace: tigera-operator

packages/rke2-calico/generated-changes/patch/crds/calico/kdd/crd.projectcalico.org_ippools.yaml.patch

@@ -18,8 +18,8 @@
                    from this pool.
                  type: boolean
 -              disableBGPExport:
--                description: 'Disable exporting routes from this IP Pool’s CIDR over
+-                description: "Disable exporting routes from this IP Pool's CIDR over
--                  BGP. [Default: false]'
+-                  BGP. [Default: false]"
 -                type: boolean
                ipip:
                  description: 'Deprecated: this field is only used for APIv1 backwards

packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_apiservers_crd.yaml.patch

@@ -1,11 +0,0 @@
---- 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:

packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_installations_crd.yaml.patch

@@ -1,6 +1,6 @@
 --- charts-original/crds/operator.tigera.io_installations_crd.yaml
 +++ charts/crds/operator.tigera.io_installations_crd.yaml
-@@ -341,13 +341,6 @@
+@@ -354,13 +354,6 @@
                    nodes on which to run Calico components. This is globally applied
                    to all resources created by the operator excluding daemonsets.
                  type: object
@@ -14,7 +14,7 @@
                controlPlaneTolerations:
                  description: ControlPlaneTolerations specify tolerations which are
                    then globally applied to all resources created by the operator.
-@@ -489,10 +482,6 @@
+@@ -531,10 +524,6 @@
                        or "OnDelete". Default is RollingUpdate.
                      type: string
                  type: object
@@ -24,8 +24,8 @@
 -                type: string
                registry:
                  description: "Registry is the default Docker registry used for component
-                   Docker images. If specified, all images will be pulled from this
+                   Docker images. If specified then the given value must end with a
-@@ -1047,13 +1036,6 @@
+@@ -1103,13 +1092,6 @@
                        plane nodes on which to run Calico components. This is globally
                        applied to all resources created by the operator excluding daemonsets.
                      type: object
@@ -39,7 +39,7 @@
                    controlPlaneTolerations:
                      description: ControlPlaneTolerations specify tolerations which
                        are then globally applied to all resources created by the operator.
-@@ -1197,10 +1179,6 @@
+@@ -1282,10 +1264,6 @@
                            or "OnDelete". Default is RollingUpdate.
                          type: string
                      type: object
@@ -49,4 +49,4 @@
 -                    type: string
                    registry:
                      description: "Registry is the default Docker registry used for
-                       component Docker images. If specified, all images will be pulled
+                       component Docker images. If specified then the given value must

packages/rke2-calico/generated-changes/patch/templates/tigera-operator/02-role-tigera-operator.yaml.patch

@@ -5,7 +5,7 @@
  apiVersion: rbac.authorization.k8s.io/v1
  kind: ClusterRole
  metadata:
-@@ -29,11 +28,11 @@
+@@ -51,11 +50,11 @@
        - nodes
      verbs:
        # Need to update node labels when migrating nodes.
@@ -21,7 +21,7 @@
    - apiGroups:
        - rbac.authorization.k8s.io
      resources:
-@@ -126,6 +125,13 @@
+@@ -148,6 +147,13 @@
        - delete
        - watch
    - apiGroups:

packages/rke2-calico/generated-changes/patch/values.yaml.patch

@@ -31,13 +31,13 @@
  tigeraOperator:
 -  image: tigera/operator
 +  image: rancher/mirrored-calico-operator
-   version: v1.23.5
+   version: v1.25.0
 -  registry: quay.io
 +  registry: docker.io
  calicoctl:
 -  image: docker.io/calico/ctl
 +  image: rancher/mirrored-calico-ctl
-   tag: v3.21.4
+   tag: v3.22.0
 +
 +global:
 +  systemDefaultRegistry: ""

packages/rke2-calico/package.yaml

@@ -1,4 +1,4 @@
-url: https://github.com/projectcalico/calico/releases/download/v3.21.4/tigera-operator-v3.21.4.tgz
+url: https://github.com/projectcalico/calico/releases/download/v3.22.0/tigera-operator-v3.22.0.tgz
 packageVersion: 01
 additionalCharts:
   - workingDir: charts-crd

packages/rke2-calico/templates/crd-template/Chart.yaml

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