Skip to content

Commit 7ea6ac4

Browse files
authored
Merge pull request #35840 from upodroid/add-cos-kops-jobs
add cos jobs to kops grid
2 parents b7aed4d + e68f823 commit 7ea6ac4

File tree

7 files changed

+7499
-951
lines changed

7 files changed

+7499
-951
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,9 @@ def generate_grid():
504504
extra_flags = ["--gce-service-account=default"] # Workaround for test-infra#24747
505505
if 'arm64' in distro:
506506
extra_flags.extend([
507-
"--node-size=c4a-standard-2",
508-
"--master-size=c4a-standard-2",
507+
"--node-size=t2a-standard-2",
508+
"--master-size=t2a-standard-2",
509+
"--zones=us-central1-a",
509510
])
510511
results.append(
511512
build_test(cloud="gce",
@@ -1506,8 +1507,9 @@ def generate_network_plugins():
15061507
extra_flags = ["--gce-service-account=default"]
15071508
if 'arm64' in distro:
15081509
extra_flags.extend([
1509-
'--node-size=c4a-standard-2',
1510-
'--master-size=c4a-standard-2',
1510+
'--node-size=t2a-standard-2',
1511+
'--master-size=t2a-standard-2',
1512+
'--zones=us-central1-a',
15111513
])
15121514
results.append(
15131515
build_test(

config/jobs/kubernetes/kops/build_vars.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131

3232
# GCE distributions
3333
gce_distro_options = [
34+
"cos121",
35+
"cos121arm64",
36+
"cos125",
37+
"cos125arm64",
38+
"cosdev",
39+
"cosdevarm64",
3440
"deb12",
3541
"deb12arm64",
3642
"deb13",

config/jobs/kubernetes/kops/helpers.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,12 @@ def latest_gce_image(project, family, arch="X86_64"):
216216
"u2404arm64": latest_gce_image("ubuntu-os-cloud", "ubuntu-2404-lts-arm64", "ARM64"),
217217
"umini2404": latest_gce_image("ubuntu-os-cloud", "ubuntu-minimal-2404-lts-amd64"),
218218
"umini2404arm64": latest_gce_image("ubuntu-os-cloud", "ubuntu-minimal-2404-lts-arm64", "ARM64"),
219+
"cos121": latest_gce_image("cos-cloud", "cos-121-lts"),
220+
"cos121arm64": latest_gce_image("cos-cloud", "cos-arm64-121-lts", "ARM64"),
219221
"cos125": latest_gce_image("cos-cloud", "cos-125-lts"),
220222
"cos125arm64": latest_gce_image("cos-cloud", "cos-arm64-125-lts", "ARM64"),
223+
"cosdev": latest_gce_image("cos-cloud", "cos-dev"),
224+
"cosdevarm64": latest_gce_image("cos-cloud", "cos-arm64-dev", "ARM64"),
221225
}
222226

223227
distro_images = {

config/jobs/kubernetes/kops/kops-periodics-grid.yaml

Lines changed: 7090 additions & 946 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)