Skip to content

Commit 7b24886

Browse files
authored
Merge pull request #36037 from kubernetes/fix-rocky-jobs
fix broken rocky aws arm jobs
2 parents 54dbcdc + 427e66f commit 7b24886

File tree

3 files changed

+1490
-991
lines changed

3 files changed

+1490
-991
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,12 @@ def generate_grid():
482482
networking_arg = networking.replace('amazon-vpc', 'amazonvpc').replace('kuberouter', 'kube-router')
483483
distro_short = distro_shortener(distro)
484484
extra_flags = []
485+
if 'arm64' in distro:
486+
extra_flags.extend([
487+
"--zones=eu-west-1a",
488+
"--node-size=m6g.large",
489+
"--master-size=m6g.large"
490+
])
485491
if networking == 'cilium-eni':
486492
extra_flags = ['--node-size=t3.large']
487493
results.append(
@@ -1743,6 +1749,13 @@ def generate_nftables():
17431749
results = []
17441750
for distro in aws_distro_options:
17451751
distro_short = distro_shortener(distro)
1752+
extra_flags = ["--set=cluster.spec.kubeProxy.proxyMode=nftables"]
1753+
if 'arm64' in distro:
1754+
extra_flags.extend([
1755+
"--zones=eu-west-1a",
1756+
"--node-size=m6g.large",
1757+
"--master-size=m6g.large"
1758+
])
17461759
results.append(
17471760
build_test(
17481761
cloud="aws",
@@ -1751,7 +1764,7 @@ def generate_nftables():
17511764
networking="kindnet",
17521765
kops_channel="alpha",
17531766
name_override=f"kops-aws-nftables-{distro_short}",
1754-
extra_flags=["--set=cluster.spec.kubeProxy.proxyMode=nftables"],
1767+
extra_flags=extra_flags,
17551768
extra_dashboards=["kops-nftables"],
17561769
runs_per_day=3,
17571770
)

0 commit comments

Comments
 (0)