Skip to content

Commit 1ecf273

Browse files
authored
Merge pull request #34783 from aojea/containerd_1.2.1
use containerd 2.1.0 and runc 1.3.0 in CI
2 parents 0e465e4 + be65671 commit 1ecf273

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ presubmits:
264264
- /workspace/scenarios/kubernetes_e2e.py
265265
args:
266266
- --build=quick
267-
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.0.0
268-
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.2.1
267+
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.1.0
268+
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.3.0
269269
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
270270
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
271271
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
@@ -345,8 +345,8 @@ presubmits:
345345
- /workspace/scenarios/kubernetes_e2e.py
346346
args:
347347
- --build=quick
348-
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.0.0
349-
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.2.1
348+
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.1.0
349+
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.3.0
350350
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
351351
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
352352
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
@@ -531,8 +531,8 @@ presubmits:
531531
- /workspace/scenarios/kubernetes_e2e.py
532532
args:
533533
- --build=quick
534-
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.0.0
535-
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.2.1
534+
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.1.0
535+
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.3.0
536536
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
537537
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
538538
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
@@ -849,8 +849,8 @@ periodics:
849849
- /workspace/scenarios/kubernetes_e2e.py
850850
args:
851851
- --check-leaked-resources
852-
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.0.0
853-
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.2.1
852+
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.1.0
853+
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.3.0
854854
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
855855
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
856856
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu

config/jobs/kubernetes/sig-network/sig-network-gce.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ presubmits:
3737
args:
3838
- --build=quick
3939
- --env=ALLOW_PRIVILEGED=true
40-
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.0.0
41-
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.2.1
40+
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.1.0
41+
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.3.0
4242
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
4343
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
4444
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
@@ -165,8 +165,8 @@ presubmits:
165165
args:
166166
- --build=quick
167167
- --env=ALLOW_PRIVILEGED=true
168-
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.0.0
169-
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.2.1
168+
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.1.0
169+
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.3.0
170170
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
171171
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
172172
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu

config/jobs/kubernetes/sig-storage/sig-storage-gce-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ periodics:
300300
- /workspace/scenarios/kubernetes_e2e.py
301301
args:
302302
- --check-leaked-resources
303-
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.0.0
304-
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.2.1
303+
- --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v2.1.0
304+
- --env=KUBE_UBUNTU_INSTALL_RUNC_VERSION=v1.3.0
305305
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
306306
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
307307
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu

0 commit comments

Comments
 (0)