Bump calico to v1.20.4

kubernetes-sigs · Feb 7, 2022 · 2a705e9 · 2a705e9
1 parent 0979392
commit 2a705e9
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 94 deletions.
diff --git a/templates/addons/calico-ipv6.yaml b/templates/addons/calico-ipv6.yaml
@@ -3676,7 +3676,7 @@ spec:
           value: node
         - name: DATASTORE_TYPE
           value: kubernetes
-        image: docker.io/calico/kube-controllers:v3.20.3
+        image: docker.io/calico/kube-controllers:v3.20.4
         livenessProbe:
           exec:
             command:
@@ -3743,7 +3743,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/typha:v3.20.3
+        image: docker.io/calico/typha:v3.20.4
         livenessProbe:
           httpGet:
             host: localhost
@@ -3857,7 +3857,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/node:v3.20.3
+        image: docker.io/calico/node:v3.20.4
         lifecycle:
           preStop:
             exec:
@@ -3932,7 +3932,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/cni:v3.20.3
+        image: docker.io/calico/cni:v3.20.4
         name: install-cni
         securityContext:
           privileged: true
@@ -3941,7 +3941,7 @@ spec:
           name: cni-bin-dir
         - mountPath: /host/etc/cni/net.d
           name: cni-net-dir
-      - image: docker.io/calico/pod2daemon-flexvol:v3.20.3
+      - image: docker.io/calico/pod2daemon-flexvol:v3.20.4
         name: flexvol-driver
         securityContext:
           privileged: true

diff --git a/templates/addons/calico.yaml b/templates/addons/calico.yaml
@@ -3690,7 +3690,7 @@ spec:
           value: node
         - name: DATASTORE_TYPE
           value: kubernetes
-        image: docker.io/calico/kube-controllers:v3.20.3
+        image: docker.io/calico/kube-controllers:v3.20.4
         livenessProbe:
           exec:
             command:
@@ -3800,7 +3800,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/node:v3.20.3
+        image: docker.io/calico/node:v3.20.4
         lifecycle:
           preStop:
             exec:
@@ -3872,7 +3872,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/cni:v3.20.3
+        image: docker.io/calico/cni:v3.20.4
         name: upgrade-ipam
         securityContext:
           privileged: true
@@ -3906,7 +3906,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/cni:v3.20.3
+        image: docker.io/calico/cni:v3.20.4
         name: install-cni
         securityContext:
           privileged: true
@@ -3915,7 +3915,7 @@ spec:
           name: cni-bin-dir
         - mountPath: /host/etc/cni/net.d
           name: cni-net-dir
-      - image: docker.io/calico/pod2daemon-flexvol:v3.20.3
+      - image: docker.io/calico/pod2daemon-flexvol:v3.20.4
         name: flexvol-driver
         securityContext:
           privileged: true

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.0-hostprocess
+          image: sigwindowstools/calico-install:v3.20.4-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.0-hostprocess
+        image: sigwindowstools/calico-node:v3.20.4-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.0-hostprocess
+        image: sigwindowstools/calico-node:v3.20.4-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
@@ -4268,7 +4268,7 @@ data:
               value: node
             - name: DATASTORE_TYPE
               value: kubernetes
-            image: docker.io/calico/kube-controllers:v3.20.3
+            image: docker.io/calico/kube-controllers:v3.20.4
             livenessProbe:
               exec:
                 command:
@@ -4378,7 +4378,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/node:v3.20.3
+            image: docker.io/calico/node:v3.20.4
             lifecycle:
               preStop:
                 exec:
@@ -4450,7 +4450,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: upgrade-ipam
             securityContext:
               privileged: true
@@ -4484,7 +4484,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: install-cni
             securityContext:
               privileged: true
@@ -4493,7 +4493,7 @@ data:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
-          - image: docker.io/calico/pod2daemon-flexvol:v3.20.3
+          - image: docker.io/calico/pod2daemon-flexvol:v3.20.4
             name: flexvol-driver
             securityContext:
               privileged: true
@@ -4601,7 +4601,7 @@ data:
     for rescheduling.\n      - key: CriticalAddonsOnly\n        operator: Exists\n
     \     - effect: NoExecute\n        operator: Exists\n      initContainers:\n        #
     This container installs the CNI binaries\n        # and CNI network config file
-    on each node.\n        - name: install-cni\n          image: sigwindowstools/calico-install:v3.20.0-hostprocess\n
+    on each node.\n        - name: install-cni\n          image: sigwindowstools/calico-install:v3.20.4-hostprocess\n
     \         args: [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1\"]\n
     \         imagePullPolicy: Always\n          env:\n            # Name of the CNI
     config file to create.\n            - name: CNI_CONF_NAME\n              value:
@@ -4620,7 +4620,7 @@ data:
     cni-net-dir\n            - name: kubeadm-config\n              mountPath: /etc/kubeadm-config/\n
     \         securityContext:\n            windowsOptions:\n              hostProcess:
     true\n              runAsUserName: \"NT AUTHORITY\\\\system\"\n      containers:\n
-    \     - name: calico-node-startup\n        image: sigwindowstools/calico-node:v3.20.0-hostprocess\n
+    \     - name: calico-node-startup\n        image: sigwindowstools/calico-node:v3.20.4-hostprocess\n
     \       args: [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1\"]\n
     \       workingDir: \"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/\"\n        imagePullPolicy:
     Always\n        volumeMounts:\n        - name: calico-config-windows\n          mountPath:
@@ -4631,7 +4631,7 @@ data:
     name: CNI_IPAM_TYPE\n          value: \"calico-ipam\"\n        - name: CALICO_NETWORKING_BACKEND\n
     \         value: \"vxlan\"\n        - name: KUBECONFIG\n          value: \"C:/etc/cni/net.d/calico-kubeconfig\"\n
     \       - name: VXLAN_VNI\n          value: \"4096\"\n      - name: calico-node-felix\n
-    \       image: sigwindowstools/calico-node:v3.20.0-hostprocess\n        args:
+    \       image: sigwindowstools/calico-node:v3.20.4-hostprocess\n        args:
     [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1\"]\n        imagePullPolicy:
     Always\n        workingDir: \"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/\"\n        volumeMounts:\n
     \       - name: calico-config-windows\n          mountPath: /etc/kube-calico-windows/\n

diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
@@ -4268,7 +4268,7 @@ data:
               value: node
             - name: DATASTORE_TYPE
               value: kubernetes
-            image: docker.io/calico/kube-controllers:v3.20.3
+            image: docker.io/calico/kube-controllers:v3.20.4
             livenessProbe:
               exec:
                 command:
@@ -4378,7 +4378,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/node:v3.20.3
+            image: docker.io/calico/node:v3.20.4
             lifecycle:
               preStop:
                 exec:
@@ -4450,7 +4450,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: upgrade-ipam
             securityContext:
               privileged: true
@@ -4484,7 +4484,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: install-cni
             securityContext:
               privileged: true
@@ -4493,7 +4493,7 @@ data:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
-          - image: docker.io/calico/pod2daemon-flexvol:v3.20.3
+          - image: docker.io/calico/pod2daemon-flexvol:v3.20.4
             name: flexvol-driver
             securityContext:
               privileged: true
@@ -4601,7 +4601,7 @@ data:
     for rescheduling.\n      - key: CriticalAddonsOnly\n        operator: Exists\n
     \     - effect: NoExecute\n        operator: Exists\n      initContainers:\n        #
     This container installs the CNI binaries\n        # and CNI network config file
-    on each node.\n        - name: install-cni\n          image: sigwindowstools/calico-install:v3.20.0-hostprocess\n
+    on each node.\n        - name: install-cni\n          image: sigwindowstools/calico-install:v3.20.4-hostprocess\n
     \         args: [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1\"]\n
     \         imagePullPolicy: Always\n          env:\n            # Name of the CNI
     config file to create.\n            - name: CNI_CONF_NAME\n              value:
@@ -4620,7 +4620,7 @@ data:
     cni-net-dir\n            - name: kubeadm-config\n              mountPath: /etc/kubeadm-config/\n
     \         securityContext:\n            windowsOptions:\n              hostProcess:
     true\n              runAsUserName: \"NT AUTHORITY\\\\system\"\n      containers:\n
-    \     - name: calico-node-startup\n        image: sigwindowstools/calico-node:v3.20.0-hostprocess\n
+    \     - name: calico-node-startup\n        image: sigwindowstools/calico-node:v3.20.4-hostprocess\n
     \       args: [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1\"]\n
     \       workingDir: \"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/\"\n        imagePullPolicy:
     Always\n        volumeMounts:\n        - name: calico-config-windows\n          mountPath:
@@ -4631,7 +4631,7 @@ data:
     name: CNI_IPAM_TYPE\n          value: \"calico-ipam\"\n        - name: CALICO_NETWORKING_BACKEND\n
     \         value: \"vxlan\"\n        - name: KUBECONFIG\n          value: \"C:/etc/cni/net.d/calico-kubeconfig\"\n
     \       - name: VXLAN_VNI\n          value: \"4096\"\n      - name: calico-node-felix\n
-    \       image: sigwindowstools/calico-node:v3.20.0-hostprocess\n        args:
+    \       image: sigwindowstools/calico-node:v3.20.4-hostprocess\n        args:
     [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1\"]\n        imagePullPolicy:
     Always\n        workingDir: \"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/\"\n        volumeMounts:\n
     \       - name: calico-config-windows\n          mountPath: /etc/kube-calico-windows/\n

diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
@@ -3963,7 +3963,7 @@ data:
               value: node
             - name: DATASTORE_TYPE
               value: kubernetes
-            image: docker.io/calico/kube-controllers:v3.20.3
+            image: docker.io/calico/kube-controllers:v3.20.4
             livenessProbe:
               exec:
                 command:
@@ -4073,7 +4073,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/node:v3.20.3
+            image: docker.io/calico/node:v3.20.4
             lifecycle:
               preStop:
                 exec:
@@ -4145,7 +4145,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: upgrade-ipam
             securityContext:
               privileged: true
@@ -4179,7 +4179,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: install-cni
             securityContext:
               privileged: true
@@ -4188,7 +4188,7 @@ data:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
-          - image: docker.io/calico/pod2daemon-flexvol:v3.20.3
+          - image: docker.io/calico/pod2daemon-flexvol:v3.20.4
             name: flexvol-driver
             securityContext:
               privileged: true

diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
@@ -4277,7 +4277,7 @@ data:
               value: node
             - name: DATASTORE_TYPE
               value: kubernetes
-            image: docker.io/calico/kube-controllers:v3.20.3
+            image: docker.io/calico/kube-controllers:v3.20.4
             livenessProbe:
               exec:
                 command:
@@ -4387,7 +4387,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/node:v3.20.3
+            image: docker.io/calico/node:v3.20.4
             lifecycle:
               preStop:
                 exec:
@@ -4459,7 +4459,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: upgrade-ipam
             securityContext:
               privileged: true
@@ -4493,7 +4493,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: install-cni
             securityContext:
               privileged: true
@@ -4502,7 +4502,7 @@ data:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
-          - image: docker.io/calico/pod2daemon-flexvol:v3.20.3
+          - image: docker.io/calico/pod2daemon-flexvol:v3.20.4
             name: flexvol-driver
             securityContext:
               privileged: true

diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
@@ -3979,7 +3979,7 @@ data:
               value: node
             - name: DATASTORE_TYPE
               value: kubernetes
-            image: docker.io/calico/kube-controllers:v3.20.3
+            image: docker.io/calico/kube-controllers:v3.20.4
             livenessProbe:
               exec:
                 command:
@@ -4046,7 +4046,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/typha:v3.20.3
+            image: docker.io/calico/typha:v3.20.4
             livenessProbe:
               httpGet:
                 host: localhost
@@ -4160,7 +4160,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/node:v3.20.3
+            image: docker.io/calico/node:v3.20.4
             lifecycle:
               preStop:
                 exec:
@@ -4235,7 +4235,7 @@ data:
             - configMapRef:
                 name: kubernetes-services-endpoint
                 optional: true
-            image: docker.io/calico/cni:v3.20.3
+            image: docker.io/calico/cni:v3.20.4
             name: install-cni
             securityContext:
               privileged: true
@@ -4244,7 +4244,7 @@ data:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
-          - image: docker.io/calico/pod2daemon-flexvol:v3.20.3
+          - image: docker.io/calico/pod2daemon-flexvol:v3.20.4
             name: flexvol-driver
             securityContext:
               privileged: true