Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Calico to v3.22.1 #2147

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions templates/addons/calico-ipv6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4007,7 +4007,7 @@ spec:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.22.0
image: docker.io/calico/kube-controllers:v3.22.1
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -4076,7 +4076,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/typha:v3.22.0
image: docker.io/calico/typha:v3.22.1
livenessProbe:
httpGet:
host: localhost
Expand Down Expand Up @@ -4192,7 +4192,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.22.0
image: docker.io/calico/node:v3.22.1
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -4267,7 +4267,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: install-cni
securityContext:
privileged: true
Expand All @@ -4276,7 +4276,7 @@ spec:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
name: flexvol-driver
securityContext:
privileged: true
Expand Down
10 changes: 5 additions & 5 deletions templates/addons/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4021,7 +4021,7 @@ spec:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.22.0
image: docker.io/calico/kube-controllers:v3.22.1
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -4131,7 +4131,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.22.0
image: docker.io/calico/node:v3.22.1
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -4203,7 +4203,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: upgrade-ipam
securityContext:
privileged: true
Expand Down Expand Up @@ -4237,7 +4237,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: install-cni
securityContext:
privileged: true
Expand All @@ -4246,7 +4246,7 @@ spec:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
name: flexvol-driver
securityContext:
privileged: true
Expand Down
6 changes: 3 additions & 3 deletions templates/addons/windows/calico/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.22.0-hostprocess
image: sigwindowstools/calico-install:v3.22.1-hostprocess
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1"]
imagePullPolicy: Always
env:
Expand Down Expand Up @@ -205,7 +205,7 @@ spec:
runAsUserName: "NT AUTHORITY\\system"
containers:
- name: calico-node-startup
image: sigwindowstools/calico-node:v3.22.0-hostprocess
image: sigwindowstools/calico-node:v3.22.1-hostprocess
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1"]
workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"
imagePullPolicy: Always
Expand All @@ -232,7 +232,7 @@ spec:
- name: VXLAN_VNI
value: "4096"
- name: calico-node-felix
image: sigwindowstools/calico-node:v3.22.0-hostprocess
image: sigwindowstools/calico-node:v3.22.1-hostprocess
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1"]
imagePullPolicy: Always
workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4614,7 +4614,7 @@ data:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.22.0
image: docker.io/calico/kube-controllers:v3.22.1
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -4724,7 +4724,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.22.0
image: docker.io/calico/node:v3.22.1
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -4796,7 +4796,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: upgrade-ipam
securityContext:
privileged: true
Expand Down Expand Up @@ -4830,7 +4830,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: install-cni
securityContext:
privileged: true
Expand All @@ -4839,7 +4839,7 @@ data:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
name: flexvol-driver
securityContext:
privileged: true
Expand Down Expand Up @@ -4947,7 +4947,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.22.0-hostprocess\n
on each node.\n - name: install-cni\n image: sigwindowstools/calico-install:v3.22.1-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:
Expand All @@ -4966,7 +4966,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.22.0-hostprocess\n
\ - name: calico-node-startup\n image: sigwindowstools/calico-node:v3.22.1-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:
Expand All @@ -4977,7 +4977,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.22.0-hostprocess\n args:
\ image: sigwindowstools/calico-node:v3.22.1-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
Expand Down
16 changes: 8 additions & 8 deletions templates/test/ci/cluster-template-prow-ci-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4614,7 +4614,7 @@ data:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.22.0
image: docker.io/calico/kube-controllers:v3.22.1
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -4724,7 +4724,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.22.0
image: docker.io/calico/node:v3.22.1
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -4796,7 +4796,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: upgrade-ipam
securityContext:
privileged: true
Expand Down Expand Up @@ -4830,7 +4830,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: install-cni
securityContext:
privileged: true
Expand All @@ -4839,7 +4839,7 @@ data:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
name: flexvol-driver
securityContext:
privileged: true
Expand Down Expand Up @@ -4947,7 +4947,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.22.0-hostprocess\n
on each node.\n - name: install-cni\n image: sigwindowstools/calico-install:v3.22.1-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:
Expand All @@ -4966,7 +4966,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.22.0-hostprocess\n
\ - name: calico-node-startup\n image: sigwindowstools/calico-node:v3.22.1-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:
Expand All @@ -4977,7 +4977,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.22.0-hostprocess\n args:
\ image: sigwindowstools/calico-node:v3.22.1-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
Expand Down
10 changes: 5 additions & 5 deletions templates/test/ci/cluster-template-prow-custom-vnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4294,7 +4294,7 @@ data:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.22.0
image: docker.io/calico/kube-controllers:v3.22.1
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -4404,7 +4404,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.22.0
image: docker.io/calico/node:v3.22.1
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -4476,7 +4476,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: upgrade-ipam
securityContext:
privileged: true
Expand Down Expand Up @@ -4510,7 +4510,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: install-cni
securityContext:
privileged: true
Expand All @@ -4519,7 +4519,7 @@ data:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
name: flexvol-driver
securityContext:
privileged: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4608,7 +4608,7 @@ data:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.22.0
image: docker.io/calico/kube-controllers:v3.22.1
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -4718,7 +4718,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.22.0
image: docker.io/calico/node:v3.22.1
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -4790,7 +4790,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: upgrade-ipam
securityContext:
privileged: true
Expand Down Expand Up @@ -4824,7 +4824,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: install-cni
securityContext:
privileged: true
Expand All @@ -4833,7 +4833,7 @@ data:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
name: flexvol-driver
securityContext:
privileged: true
Expand Down
10 changes: 5 additions & 5 deletions templates/test/ci/cluster-template-prow-ipv6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4310,7 +4310,7 @@ data:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.22.0
image: docker.io/calico/kube-controllers:v3.22.1
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -4379,7 +4379,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/typha:v3.22.0
image: docker.io/calico/typha:v3.22.1
livenessProbe:
httpGet:
host: localhost
Expand Down Expand Up @@ -4495,7 +4495,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.22.0
image: docker.io/calico/node:v3.22.1
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -4570,7 +4570,7 @@ data:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: install-cni
securityContext:
privileged: true
Expand All @@ -4579,7 +4579,7 @@ data:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
name: flexvol-driver
securityContext:
privileged: true
Expand Down
Loading