Skip to content

Commit f436296

Browse files
committed
Upgrade GCE Ubuntu jobs from 22.04 to 24.04 LTS
Switch from hardcoded ubuntu-2204-jammy image names to using KUBE_GCE_IMAGE_FAMILY=ubuntu-2404-lts-amd64. This ensures jobs automatically use the latest image in the family and avoids cluster initialization timeouts caused by slow containerd downloads on outdated images. Updated jobs: - ci-kubernetes-e2e-ubuntu-gce-containerd - ci-kubernetes-e2e-gci-gce-serial-containerd - ci-kubernetes-e2e-gci-gce-serial-containerd-flaky - ci-kubernetes-e2e-serial-gce - ci-kubernetes-e2e-gce-ingress-lb-controllers-e2e-k8s-master - ci-kubernetes-e2e-ubuntu-gce-network-proxy-ipvs - ci-kubernetes-e2e-gci-gce-iscsi-serial Signed-off-by: Davanum Srinivas <davanum@gmail.com>
1 parent e2c3345 commit f436296

File tree

3 files changed

+14
-28
lines changed

3 files changed

+14
-28
lines changed

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,9 @@ periodics:
6565
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
6666
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
6767
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
68-
- --env=KUBE_GCE_MASTER_IMAGE=ubuntu-2204-jammy-v20220712a
69-
- --env=KUBE_GCE_MASTER_PROJECT=ubuntu-os-cloud
68+
- --env=KUBE_GCE_IMAGE_FAMILY=ubuntu-2404-lts-amd64
69+
- --env=KUBE_GCE_IMAGE_PROJECT=ubuntu-os-cloud
7070
- --env=KUBE_NODE_OS_DISTRIBUTION=ubuntu
71-
- --env=KUBE_GCE_NODE_IMAGE=ubuntu-2204-jammy-v20220712a
72-
- --env=KUBE_GCE_NODE_PROJECT=ubuntu-os-cloud
7371
- --extract=ci/fast/latest-fast
7472
- --gcp-master-image=ubuntu
7573
- --gcp-node-image=ubuntu
@@ -776,11 +774,9 @@ presubmits:
776774
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
777775
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
778776
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
779-
- --env=KUBE_GCE_MASTER_IMAGE=ubuntu-2204-jammy-v20220712a
780-
- --env=KUBE_GCE_MASTER_PROJECT=ubuntu-os-cloud
777+
- --env=KUBE_GCE_IMAGE_FAMILY=ubuntu-2404-lts-amd64
778+
- --env=KUBE_GCE_IMAGE_PROJECT=ubuntu-os-cloud
781779
- --env=KUBE_NODE_OS_DISTRIBUTION=ubuntu
782-
- --env=KUBE_GCE_NODE_IMAGE=ubuntu-2204-jammy-v20220712a
783-
- --env=KUBE_GCE_NODE_PROJECT=ubuntu-os-cloud
784780
- --gcp-master-image=ubuntu
785781
- --gcp-node-image=ubuntu
786782
- --gcp-region=us-central1
@@ -839,11 +835,9 @@ presubmits:
839835
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
840836
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
841837
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
842-
- --env=KUBE_GCE_MASTER_IMAGE=ubuntu-2204-jammy-v20220712a
843-
- --env=KUBE_GCE_MASTER_PROJECT=ubuntu-os-cloud
838+
- --env=KUBE_GCE_IMAGE_FAMILY=ubuntu-2404-lts-amd64
839+
- --env=KUBE_GCE_IMAGE_PROJECT=ubuntu-os-cloud
844840
- --env=KUBE_NODE_OS_DISTRIBUTION=ubuntu
845-
- --env=KUBE_GCE_NODE_IMAGE=ubuntu-2204-jammy-v20220712a
846-
- --env=KUBE_GCE_NODE_PROJECT=ubuntu-os-cloud
847841
- --gcp-master-image=ubuntu
848842
- --gcp-node-image=ubuntu
849843
- --gcp-region=us-central1
@@ -1147,11 +1141,9 @@ presubmits:
11471141
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
11481142
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
11491143
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
1150-
- --env=KUBE_GCE_MASTER_IMAGE=ubuntu-2204-jammy-v20220712a
1151-
- --env=KUBE_GCE_MASTER_PROJECT=ubuntu-os-cloud
1144+
- --env=KUBE_GCE_IMAGE_FAMILY=ubuntu-2404-lts-amd64
1145+
- --env=KUBE_GCE_IMAGE_PROJECT=ubuntu-os-cloud
11521146
- --env=KUBE_NODE_OS_DISTRIBUTION=ubuntu
1153-
- --env=KUBE_GCE_NODE_IMAGE=ubuntu-2204-jammy-v20220712a
1154-
- --env=KUBE_GCE_NODE_PROJECT=ubuntu-os-cloud
11551147
- --gcp-master-image=ubuntu
11561148
- --gcp-node-image=ubuntu
11571149
- --gcp-region=us-central1

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ presubmits:
4242
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
4343
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
4444
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
45-
- --env=KUBE_GCE_MASTER_IMAGE=ubuntu-2204-jammy-v20230919
46-
- --env=KUBE_GCE_MASTER_PROJECT=ubuntu-os-cloud
45+
- --env=KUBE_GCE_IMAGE_FAMILY=ubuntu-2404-lts-amd64
46+
- --env=KUBE_GCE_IMAGE_PROJECT=ubuntu-os-cloud
4747
- --env=KUBE_NODE_OS_DISTRIBUTION=ubuntu
48-
- --env=KUBE_GCE_NODE_IMAGE=ubuntu-2204-jammy-v20230919
49-
- --env=KUBE_GCE_NODE_PROJECT=ubuntu-os-cloud
5048
- --env=GCE_ALPHA_FEATURES=NetworkEndpointGroup
5149
- --env=KUBE_GCE_ENABLE_IP_ALIASES=true
5250
- --gcp-master-image=ubuntu
@@ -170,11 +168,9 @@ presubmits:
170168
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
171169
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
172170
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
173-
- --env=KUBE_GCE_MASTER_IMAGE=ubuntu-2204-jammy-v20230919
174-
- --env=KUBE_GCE_MASTER_PROJECT=ubuntu-os-cloud
171+
- --env=KUBE_GCE_IMAGE_FAMILY=ubuntu-2404-lts-amd64
172+
- --env=KUBE_GCE_IMAGE_PROJECT=ubuntu-os-cloud
175173
- --env=KUBE_NODE_OS_DISTRIBUTION=ubuntu
176-
- --env=KUBE_GCE_NODE_IMAGE=ubuntu-2204-jammy-v20230919
177-
- --env=KUBE_GCE_NODE_PROJECT=ubuntu-os-cloud
178174
- --env=KUBE_PROXY_MODE=ipvs
179175
- --gcp-master-image=ubuntu
180176
- --gcp-node-image=ubuntu

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,9 @@ periodics:
305305
- --env=LOG_DUMP_SYSTEMD_SERVICES=containerd
306306
- --env=CONTAINER_RUNTIME_TEST_HANDLER=true
307307
- --env=KUBE_MASTER_OS_DISTRIBUTION=ubuntu
308-
- --env=KUBE_GCE_MASTER_IMAGE=ubuntu-2204-jammy-v20220712a
309-
- --env=KUBE_GCE_MASTER_PROJECT=ubuntu-os-cloud
308+
- --env=KUBE_GCE_IMAGE_FAMILY=ubuntu-2404-lts-amd64
309+
- --env=KUBE_GCE_IMAGE_PROJECT=ubuntu-os-cloud
310310
- --env=KUBE_NODE_OS_DISTRIBUTION=ubuntu
311-
- --env=KUBE_GCE_NODE_IMAGE=ubuntu-2204-jammy-v20220712a
312-
- --env=KUBE_GCE_NODE_PROJECT=ubuntu-os-cloud
313311
- --extract=ci/fast/latest-fast
314312
- --gcp-master-image=ubuntu
315313
- --gcp-node-image=ubuntu

0 commit comments

Comments
 (0)