Update Calico to v3.22.0

kubernetes-sigs · Feb 25, 2022 · 032fd9d · 032fd9d
1 parent c444fdb
commit 032fd9d
Show file tree

Hide file tree

Showing 18 changed files with 4,986 additions and 359 deletions.
diff --git a/templates/addons/calico-ipv6.yaml b/templates/addons/calico-ipv6.yaml
diff --git a/templates/addons/calico-ipv6/kustomization.yaml b/templates/addons/calico-ipv6/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-    - https://docs.projectcalico.org/v3.20/manifests/calico-policy-only.yaml
+    - https://docs.projectcalico.org/v3.22/manifests/calico-policy-only.yaml
 patchesStrategicMerge:
     - patches/azure-mtu.yaml
 patches:

diff --git a/templates/addons/calico.yaml b/templates/addons/calico.yaml
diff --git a/templates/addons/calico/kustomization.yaml b/templates/addons/calico/kustomization.yaml
@@ -1,19 +1,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-    - https://docs.projectcalico.org/v3.20/manifests/calico-vxlan.yaml
+    - https://docs.projectcalico.org/v3.22/manifests/calico-vxlan.yaml
 patchesStrategicMerge:
     - patches/azure-mtu.yaml
 patches:
 - path: patches/calico-node.yaml
   target:
     kind: DaemonSet
-- target:
-    version: v1
-    kind: DaemonSet
-    name: calico-node
-    namespace: kube-system
-  path: patches/remove-aws-reference.yaml
 - path: patches/control-plane-tolerations.yaml
   target:
     kind: Deployment

diff --git a/templates/addons/calico/patches/remove-aws-reference.yaml b/templates/addons/calico/patches/remove-aws-reference.yaml
diff --git a/templates/addons/windows/calico/calico.yaml b/templates/addons/windows/calico/calico.yaml
@@ -163,7 +163,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: sigwindowstools/calico-install:v3.20.4-hostprocess
+          image: sigwindowstools/calico-install:v3.22.0-hostprocess
           args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1"]
           imagePullPolicy: Always
           env:
@@ -205,7 +205,7 @@ spec:
               runAsUserName: "NT AUTHORITY\\system"
       containers:
       - name: calico-node-startup
-        image: sigwindowstools/calico-node:v3.20.4-hostprocess
+        image: sigwindowstools/calico-node:v3.22.0-hostprocess
         args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1"]
         workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"
         imagePullPolicy: Always
@@ -232,7 +232,7 @@ spec:
         - name: VXLAN_VNI
           value: "4096"
       - name: calico-node-felix
-        image: sigwindowstools/calico-node:v3.20.4-hostprocess
+        image: sigwindowstools/calico-node:v3.22.0-hostprocess
         args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1"]
         imagePullPolicy: Always
         workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"

diff --git a/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml b/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml