Skip to content

Commit 16a804d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2147 from CecileRobertMichon/calico-3.22.1
Update Calico to v3.22.1
2 parents d0b9621 + ead3506 commit 16a804d

15 files changed

+94
-94
lines changed

‎templates/addons/calico-ipv6.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4007,7 +4007,7 @@ spec:
40074007
value: node
40084008
- name: DATASTORE_TYPE
40094009
value: kubernetes
4010-
image: docker.io/calico/kube-controllers:v3.22.0
4010+
image: docker.io/calico/kube-controllers:v3.22.1
40114011
livenessProbe:
40124012
exec:
40134013
command:
@@ -4076,7 +4076,7 @@ spec:
40764076
- configMapRef:
40774077
name: kubernetes-services-endpoint
40784078
optional: true
4079-
image: docker.io/calico/typha:v3.22.0
4079+
image: docker.io/calico/typha:v3.22.1
40804080
livenessProbe:
40814081
httpGet:
40824082
host: localhost
@@ -4192,7 +4192,7 @@ spec:
41924192
- configMapRef:
41934193
name: kubernetes-services-endpoint
41944194
optional: true
4195-
image: docker.io/calico/node:v3.22.0
4195+
image: docker.io/calico/node:v3.22.1
41964196
lifecycle:
41974197
preStop:
41984198
exec:
@@ -4267,7 +4267,7 @@ spec:
42674267
- configMapRef:
42684268
name: kubernetes-services-endpoint
42694269
optional: true
4270-
image: docker.io/calico/cni:v3.22.0
4270+
image: docker.io/calico/cni:v3.22.1
42714271
name: install-cni
42724272
securityContext:
42734273
privileged: true
@@ -4276,7 +4276,7 @@ spec:
42764276
name: cni-bin-dir
42774277
- mountPath: /host/etc/cni/net.d
42784278
name: cni-net-dir
4279-
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
4279+
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
42804280
name: flexvol-driver
42814281
securityContext:
42824282
privileged: true

‎templates/addons/calico.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4021,7 +4021,7 @@ spec:
40214021
value: node
40224022
- name: DATASTORE_TYPE
40234023
value: kubernetes
4024-
image: docker.io/calico/kube-controllers:v3.22.0
4024+
image: docker.io/calico/kube-controllers:v3.22.1
40254025
livenessProbe:
40264026
exec:
40274027
command:
@@ -4131,7 +4131,7 @@ spec:
41314131
- configMapRef:
41324132
name: kubernetes-services-endpoint
41334133
optional: true
4134-
image: docker.io/calico/node:v3.22.0
4134+
image: docker.io/calico/node:v3.22.1
41354135
lifecycle:
41364136
preStop:
41374137
exec:
@@ -4203,7 +4203,7 @@ spec:
42034203
- configMapRef:
42044204
name: kubernetes-services-endpoint
42054205
optional: true
4206-
image: docker.io/calico/cni:v3.22.0
4206+
image: docker.io/calico/cni:v3.22.1
42074207
name: upgrade-ipam
42084208
securityContext:
42094209
privileged: true
@@ -4237,7 +4237,7 @@ spec:
42374237
- configMapRef:
42384238
name: kubernetes-services-endpoint
42394239
optional: true
4240-
image: docker.io/calico/cni:v3.22.0
4240+
image: docker.io/calico/cni:v3.22.1
42414241
name: install-cni
42424242
securityContext:
42434243
privileged: true
@@ -4246,7 +4246,7 @@ spec:
42464246
name: cni-bin-dir
42474247
- mountPath: /host/etc/cni/net.d
42484248
name: cni-net-dir
4249-
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
4249+
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
42504250
name: flexvol-driver
42514251
securityContext:
42524252
privileged: true

‎templates/addons/windows/calico/calico.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ spec:
163163
# This container installs the CNI binaries
164164
# and CNI network config file on each node.
165165
- name: install-cni
166-
image: sigwindowstools/calico-install:v3.22.0-hostprocess
166+
image: sigwindowstools/calico-install:v3.22.1-hostprocess
167167
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1"]
168168
imagePullPolicy: Always
169169
env:
@@ -205,7 +205,7 @@ spec:
205205
runAsUserName: "NT AUTHORITY\\system"
206206
containers:
207207
- name: calico-node-startup
208-
image: sigwindowstools/calico-node:v3.22.0-hostprocess
208+
image: sigwindowstools/calico-node:v3.22.1-hostprocess
209209
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1"]
210210
workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"
211211
imagePullPolicy: Always
@@ -232,7 +232,7 @@ spec:
232232
- name: VXLAN_VNI
233233
value: "4096"
234234
- name: calico-node-felix
235-
image: sigwindowstools/calico-node:v3.22.0-hostprocess
235+
image: sigwindowstools/calico-node:v3.22.1-hostprocess
236236
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1"]
237237
imagePullPolicy: Always
238238
workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"

‎templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4614,7 +4614,7 @@ data:
46144614
value: node
46154615
- name: DATASTORE_TYPE
46164616
value: kubernetes
4617-
image: docker.io/calico/kube-controllers:v3.22.0
4617+
image: docker.io/calico/kube-controllers:v3.22.1
46184618
livenessProbe:
46194619
exec:
46204620
command:
@@ -4724,7 +4724,7 @@ data:
47244724
- configMapRef:
47254725
name: kubernetes-services-endpoint
47264726
optional: true
4727-
image: docker.io/calico/node:v3.22.0
4727+
image: docker.io/calico/node:v3.22.1
47284728
lifecycle:
47294729
preStop:
47304730
exec:
@@ -4796,7 +4796,7 @@ data:
47964796
- configMapRef:
47974797
name: kubernetes-services-endpoint
47984798
optional: true
4799-
image: docker.io/calico/cni:v3.22.0
4799+
image: docker.io/calico/cni:v3.22.1
48004800
name: upgrade-ipam
48014801
securityContext:
48024802
privileged: true
@@ -4830,7 +4830,7 @@ data:
48304830
- configMapRef:
48314831
name: kubernetes-services-endpoint
48324832
optional: true
4833-
image: docker.io/calico/cni:v3.22.0
4833+
image: docker.io/calico/cni:v3.22.1
48344834
name: install-cni
48354835
securityContext:
48364836
privileged: true
@@ -4839,7 +4839,7 @@ data:
48394839
name: cni-bin-dir
48404840
- mountPath: /host/etc/cni/net.d
48414841
name: cni-net-dir
4842-
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
4842+
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
48434843
name: flexvol-driver
48444844
securityContext:
48454845
privileged: true
@@ -4947,7 +4947,7 @@ data:
49474947
for rescheduling.\n - key: CriticalAddonsOnly\n operator: Exists\n
49484948
\ - effect: NoExecute\n operator: Exists\n initContainers:\n #
49494949
This container installs the CNI binaries\n # and CNI network config file
4950-
on each node.\n - name: install-cni\n image: sigwindowstools/calico-install:v3.22.0-hostprocess\n
4950+
on each node.\n - name: install-cni\n image: sigwindowstools/calico-install:v3.22.1-hostprocess\n
49514951
\ args: [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1\"]\n
49524952
\ imagePullPolicy: Always\n env:\n # Name of the CNI
49534953
config file to create.\n - name: CNI_CONF_NAME\n value:
@@ -4966,7 +4966,7 @@ data:
49664966
cni-net-dir\n - name: kubeadm-config\n mountPath: /etc/kubeadm-config/\n
49674967
\ securityContext:\n windowsOptions:\n hostProcess:
49684968
true\n runAsUserName: \"NT AUTHORITY\\\\system\"\n containers:\n
4969-
\ - name: calico-node-startup\n image: sigwindowstools/calico-node:v3.22.0-hostprocess\n
4969+
\ - name: calico-node-startup\n image: sigwindowstools/calico-node:v3.22.1-hostprocess\n
49704970
\ args: [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1\"]\n
49714971
\ workingDir: \"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/\"\n imagePullPolicy:
49724972
Always\n volumeMounts:\n - name: calico-config-windows\n mountPath:
@@ -4977,7 +4977,7 @@ data:
49774977
name: CNI_IPAM_TYPE\n value: \"calico-ipam\"\n - name: CALICO_NETWORKING_BACKEND\n
49784978
\ value: \"vxlan\"\n - name: KUBECONFIG\n value: \"C:/etc/cni/net.d/calico-kubeconfig\"\n
49794979
\ - name: VXLAN_VNI\n value: \"4096\"\n - name: calico-node-felix\n
4980-
\ image: sigwindowstools/calico-node:v3.22.0-hostprocess\n args:
4980+
\ image: sigwindowstools/calico-node:v3.22.1-hostprocess\n args:
49814981
[\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1\"]\n imagePullPolicy:
49824982
Always\n workingDir: \"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/\"\n volumeMounts:\n
49834983
\ - name: calico-config-windows\n mountPath: /etc/kube-calico-windows/\n

‎templates/test/ci/cluster-template-prow-ci-version.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4614,7 +4614,7 @@ data:
46144614
value: node
46154615
- name: DATASTORE_TYPE
46164616
value: kubernetes
4617-
image: docker.io/calico/kube-controllers:v3.22.0
4617+
image: docker.io/calico/kube-controllers:v3.22.1
46184618
livenessProbe:
46194619
exec:
46204620
command:
@@ -4724,7 +4724,7 @@ data:
47244724
- configMapRef:
47254725
name: kubernetes-services-endpoint
47264726
optional: true
4727-
image: docker.io/calico/node:v3.22.0
4727+
image: docker.io/calico/node:v3.22.1
47284728
lifecycle:
47294729
preStop:
47304730
exec:
@@ -4796,7 +4796,7 @@ data:
47964796
- configMapRef:
47974797
name: kubernetes-services-endpoint
47984798
optional: true
4799-
image: docker.io/calico/cni:v3.22.0
4799+
image: docker.io/calico/cni:v3.22.1
48004800
name: upgrade-ipam
48014801
securityContext:
48024802
privileged: true
@@ -4830,7 +4830,7 @@ data:
48304830
- configMapRef:
48314831
name: kubernetes-services-endpoint
48324832
optional: true
4833-
image: docker.io/calico/cni:v3.22.0
4833+
image: docker.io/calico/cni:v3.22.1
48344834
name: install-cni
48354835
securityContext:
48364836
privileged: true
@@ -4839,7 +4839,7 @@ data:
48394839
name: cni-bin-dir
48404840
- mountPath: /host/etc/cni/net.d
48414841
name: cni-net-dir
4842-
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
4842+
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
48434843
name: flexvol-driver
48444844
securityContext:
48454845
privileged: true
@@ -4947,7 +4947,7 @@ data:
49474947
for rescheduling.\n - key: CriticalAddonsOnly\n operator: Exists\n
49484948
\ - effect: NoExecute\n operator: Exists\n initContainers:\n #
49494949
This container installs the CNI binaries\n # and CNI network config file
4950-
on each node.\n - name: install-cni\n image: sigwindowstools/calico-install:v3.22.0-hostprocess\n
4950+
on each node.\n - name: install-cni\n image: sigwindowstools/calico-install:v3.22.1-hostprocess\n
49514951
\ args: [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1\"]\n
49524952
\ imagePullPolicy: Always\n env:\n # Name of the CNI
49534953
config file to create.\n - name: CNI_CONF_NAME\n value:
@@ -4966,7 +4966,7 @@ data:
49664966
cni-net-dir\n - name: kubeadm-config\n mountPath: /etc/kubeadm-config/\n
49674967
\ securityContext:\n windowsOptions:\n hostProcess:
49684968
true\n runAsUserName: \"NT AUTHORITY\\\\system\"\n containers:\n
4969-
\ - name: calico-node-startup\n image: sigwindowstools/calico-node:v3.22.0-hostprocess\n
4969+
\ - name: calico-node-startup\n image: sigwindowstools/calico-node:v3.22.1-hostprocess\n
49704970
\ args: [\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1\"]\n
49714971
\ workingDir: \"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/\"\n imagePullPolicy:
49724972
Always\n volumeMounts:\n - name: calico-config-windows\n mountPath:
@@ -4977,7 +4977,7 @@ data:
49774977
name: CNI_IPAM_TYPE\n value: \"calico-ipam\"\n - name: CALICO_NETWORKING_BACKEND\n
49784978
\ value: \"vxlan\"\n - name: KUBECONFIG\n value: \"C:/etc/cni/net.d/calico-kubeconfig\"\n
49794979
\ - name: VXLAN_VNI\n value: \"4096\"\n - name: calico-node-felix\n
4980-
\ image: sigwindowstools/calico-node:v3.22.0-hostprocess\n args:
4980+
\ image: sigwindowstools/calico-node:v3.22.1-hostprocess\n args:
49814981
[\"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1\"]\n imagePullPolicy:
49824982
Always\n workingDir: \"$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/\"\n volumeMounts:\n
49834983
\ - name: calico-config-windows\n mountPath: /etc/kube-calico-windows/\n

‎templates/test/ci/cluster-template-prow-custom-vnet.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4294,7 +4294,7 @@ data:
42944294
value: node
42954295
- name: DATASTORE_TYPE
42964296
value: kubernetes
4297-
image: docker.io/calico/kube-controllers:v3.22.0
4297+
image: docker.io/calico/kube-controllers:v3.22.1
42984298
livenessProbe:
42994299
exec:
43004300
command:
@@ -4404,7 +4404,7 @@ data:
44044404
- configMapRef:
44054405
name: kubernetes-services-endpoint
44064406
optional: true
4407-
image: docker.io/calico/node:v3.22.0
4407+
image: docker.io/calico/node:v3.22.1
44084408
lifecycle:
44094409
preStop:
44104410
exec:
@@ -4476,7 +4476,7 @@ data:
44764476
- configMapRef:
44774477
name: kubernetes-services-endpoint
44784478
optional: true
4479-
image: docker.io/calico/cni:v3.22.0
4479+
image: docker.io/calico/cni:v3.22.1
44804480
name: upgrade-ipam
44814481
securityContext:
44824482
privileged: true
@@ -4510,7 +4510,7 @@ data:
45104510
- configMapRef:
45114511
name: kubernetes-services-endpoint
45124512
optional: true
4513-
image: docker.io/calico/cni:v3.22.0
4513+
image: docker.io/calico/cni:v3.22.1
45144514
name: install-cni
45154515
securityContext:
45164516
privileged: true
@@ -4519,7 +4519,7 @@ data:
45194519
name: cni-bin-dir
45204520
- mountPath: /host/etc/cni/net.d
45214521
name: cni-net-dir
4522-
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
4522+
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
45234523
name: flexvol-driver
45244524
securityContext:
45254525
privileged: true

‎templates/test/ci/cluster-template-prow-external-cloud-provider.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4608,7 +4608,7 @@ data:
46084608
value: node
46094609
- name: DATASTORE_TYPE
46104610
value: kubernetes
4611-
image: docker.io/calico/kube-controllers:v3.22.0
4611+
image: docker.io/calico/kube-controllers:v3.22.1
46124612
livenessProbe:
46134613
exec:
46144614
command:
@@ -4718,7 +4718,7 @@ data:
47184718
- configMapRef:
47194719
name: kubernetes-services-endpoint
47204720
optional: true
4721-
image: docker.io/calico/node:v3.22.0
4721+
image: docker.io/calico/node:v3.22.1
47224722
lifecycle:
47234723
preStop:
47244724
exec:
@@ -4790,7 +4790,7 @@ data:
47904790
- configMapRef:
47914791
name: kubernetes-services-endpoint
47924792
optional: true
4793-
image: docker.io/calico/cni:v3.22.0
4793+
image: docker.io/calico/cni:v3.22.1
47944794
name: upgrade-ipam
47954795
securityContext:
47964796
privileged: true
@@ -4824,7 +4824,7 @@ data:
48244824
- configMapRef:
48254825
name: kubernetes-services-endpoint
48264826
optional: true
4827-
image: docker.io/calico/cni:v3.22.0
4827+
image: docker.io/calico/cni:v3.22.1
48284828
name: install-cni
48294829
securityContext:
48304830
privileged: true
@@ -4833,7 +4833,7 @@ data:
48334833
name: cni-bin-dir
48344834
- mountPath: /host/etc/cni/net.d
48354835
name: cni-net-dir
4836-
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
4836+
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
48374837
name: flexvol-driver
48384838
securityContext:
48394839
privileged: true

‎templates/test/ci/cluster-template-prow-ipv6.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4310,7 +4310,7 @@ data:
43104310
value: node
43114311
- name: DATASTORE_TYPE
43124312
value: kubernetes
4313-
image: docker.io/calico/kube-controllers:v3.22.0
4313+
image: docker.io/calico/kube-controllers:v3.22.1
43144314
livenessProbe:
43154315
exec:
43164316
command:
@@ -4379,7 +4379,7 @@ data:
43794379
- configMapRef:
43804380
name: kubernetes-services-endpoint
43814381
optional: true
4382-
image: docker.io/calico/typha:v3.22.0
4382+
image: docker.io/calico/typha:v3.22.1
43834383
livenessProbe:
43844384
httpGet:
43854385
host: localhost
@@ -4495,7 +4495,7 @@ data:
44954495
- configMapRef:
44964496
name: kubernetes-services-endpoint
44974497
optional: true
4498-
image: docker.io/calico/node:v3.22.0
4498+
image: docker.io/calico/node:v3.22.1
44994499
lifecycle:
45004500
preStop:
45014501
exec:
@@ -4570,7 +4570,7 @@ data:
45704570
- configMapRef:
45714571
name: kubernetes-services-endpoint
45724572
optional: true
4573-
image: docker.io/calico/cni:v3.22.0
4573+
image: docker.io/calico/cni:v3.22.1
45744574
name: install-cni
45754575
securityContext:
45764576
privileged: true
@@ -4579,7 +4579,7 @@ data:
45794579
name: cni-bin-dir
45804580
- mountPath: /host/etc/cni/net.d
45814581
name: cni-net-dir
4582-
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
4582+
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
45834583
name: flexvol-driver
45844584
securityContext:
45854585
privileged: true

0 commit comments

Comments
 (0)