Skip to content

Commit 34588ef

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #33441 from rifelpet/u2404
Kops - Migrate more e2e jobs to Ubuntu 24.04
2 parents 5f7f284 + dc6aaab commit 34588ef

10 files changed

+362
-362
lines changed

‎config/jobs/kubernetes/kops/build_jobs.py

+36-36
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ def generate_misc():
540540
# Test Cilium against ci k8s test suite
541541
build_test(name_override="kops-aws-cni-cilium-k8s-ci",
542542
cloud="aws",
543-
distro="u2204arm64",
543+
distro="u2404arm64",
544544
k8s_version="ci",
545545
networking="cilium",
546546
runs_per_day=1,
@@ -576,7 +576,7 @@ def generate_misc():
576576
# A special test for IPv6 using Calico CNI
577577
build_test(name_override="kops-aws-cni-calico-ipv6",
578578
cloud="aws",
579-
distro="u2204arm64",
579+
distro="u2404arm64",
580580
k8s_version="stable",
581581
networking="calico",
582582
runs_per_day=3,
@@ -590,7 +590,7 @@ def generate_misc():
590590
# A special test for IPv6 using Cilium CNI
591591
build_test(name_override="kops-aws-cni-cilium-ipv6",
592592
cloud="aws",
593-
distro="u2204arm64",
593+
distro="u2404arm64",
594594
k8s_version="stable",
595595
networking="cilium",
596596
runs_per_day=3,
@@ -630,7 +630,7 @@ def generate_misc():
630630
# A special test for disabling IRSA
631631
build_test(name_override="kops-scenario-no-irsa",
632632
cloud="aws",
633-
distro="u2204arm64",
633+
distro="u2404arm64",
634634
k8s_version="stable",
635635
runs_per_day=3,
636636
irsa=False,
@@ -641,7 +641,7 @@ def generate_misc():
641641
# A special test for warm pool
642642
build_test(name_override="kops-warm-pool",
643643
cloud="aws",
644-
distro="u2204arm64",
644+
distro="u2404arm64",
645645
k8s_version="stable",
646646
runs_per_day=3,
647647
networking="cilium",
@@ -653,7 +653,7 @@ def generate_misc():
653653
# A special test for private topology
654654
build_test(name_override="kops-aws-private",
655655
cloud="aws",
656-
distro="u2204arm64",
656+
distro="u2404arm64",
657657
k8s_version="stable",
658658
runs_per_day=3,
659659
networking="calico",
@@ -664,7 +664,7 @@ def generate_misc():
664664

665665
build_test(name_override="kops-scenario-terraform",
666666
cloud="aws",
667-
distro="u2204arm64",
667+
distro="u2404arm64",
668668
k8s_version="stable",
669669
runs_per_day=1,
670670
terraform_version="1.5.5",
@@ -675,7 +675,7 @@ def generate_misc():
675675
extra_dashboards=['kops-misc']),
676676
build_test(name_override="kops-scenario-ipv6-terraform",
677677
cloud="aws",
678-
distro="u2204arm64",
678+
distro="u2404arm64",
679679
k8s_version="stable",
680680
runs_per_day=1,
681681
terraform_version="1.5.5",
@@ -690,7 +690,7 @@ def generate_misc():
690690

691691
build_test(name_override="kops-aws-ha-euwest1",
692692
cloud="aws",
693-
distro="u2204arm64",
693+
distro="u2404arm64",
694694
k8s_version="stable",
695695
networking="calico",
696696
kops_channel="alpha",
@@ -704,7 +704,7 @@ def generate_misc():
704704
build_test(name_override="kops-aws-arm64-release",
705705
cloud="aws",
706706
k8s_version="latest",
707-
distro="u2204arm64",
707+
distro="u2404arm64",
708708
networking="calico",
709709
kops_channel="alpha",
710710
runs_per_day=3,
@@ -716,7 +716,7 @@ def generate_misc():
716716
build_test(name_override="kops-aws-arm64-ci",
717717
cloud="aws",
718718
k8s_version="ci",
719-
distro="u2204arm64",
719+
distro="u2404arm64",
720720
networking="calico",
721721
kops_channel="alpha",
722722
runs_per_day=3,
@@ -728,7 +728,7 @@ def generate_misc():
728728
build_test(name_override="kops-aws-arm64-conformance",
729729
cloud="aws",
730730
k8s_version="ci",
731-
distro="u2204arm64",
731+
distro="u2404arm64",
732732
networking="calico",
733733
kops_channel="alpha",
734734
runs_per_day=3,
@@ -742,7 +742,7 @@ def generate_misc():
742742
build_test(name_override="kops-aws-amd64-conformance",
743743
cloud="aws",
744744
k8s_version="ci",
745-
distro='u2204',
745+
distro='u2404',
746746
networking="calico",
747747
kops_channel="alpha",
748748
runs_per_day=3,
@@ -800,7 +800,7 @@ def generate_misc():
800800

801801
build_test(name_override="kops-aws-external-dns",
802802
cloud="aws",
803-
distro="u2204arm64",
803+
distro="u2404arm64",
804804
k8s_version="stable",
805805
networking="cilium",
806806
kops_channel="alpha",
@@ -813,7 +813,7 @@ def generate_misc():
813813

814814
build_test(name_override="kops-aws-ipv6-external-dns",
815815
cloud="aws",
816-
distro="u2204arm64",
816+
distro="u2404arm64",
817817
k8s_version="stable",
818818
networking="cilium",
819819
kops_channel="alpha",
@@ -828,7 +828,7 @@ def generate_misc():
828828

829829
build_test(name_override="kops-aws-apiserver-nodes",
830830
cloud="aws",
831-
distro="u2204arm64",
831+
distro="u2404arm64",
832832
k8s_version="stable",
833833
runs_per_day=3,
834834
template_path="/home/prow/go/src/k8s.io/kops/tests/e2e/templates/apiserver.yaml.tmpl",
@@ -837,7 +837,7 @@ def generate_misc():
837837

838838
build_test(name_override="kops-aws-karpenter",
839839
cloud="aws",
840-
distro="u2204arm64",
840+
distro="u2404arm64",
841841
k8s_version="stable",
842842
networking="cilium",
843843
kops_channel="alpha",
@@ -852,7 +852,7 @@ def generate_misc():
852852

853853
build_test(name_override="kops-aws-ipv6-karpenter",
854854
cloud="aws",
855-
distro="u2204arm64",
855+
distro="u2404arm64",
856856
k8s_version="stable",
857857
networking="cilium",
858858
kops_channel="alpha",
@@ -1335,7 +1335,7 @@ def generate_conformance():
13351335
kops_channel='alpha',
13361336
name_override=f"kops-aws-conformance-arm64-{version.replace('.', '-')}",
13371337
networking='calico',
1338-
distro="u2204arm64",
1338+
distro="u2404arm64",
13391339
extra_flags=["--zones=eu-central-1a",
13401340
"--node-size=t4g.large",
13411341
"--master-size=t4g.large"],
@@ -1427,7 +1427,7 @@ def generate_network_plugins():
14271427
k8s_version = 'ci'
14281428
results.append(
14291429
build_test(
1430-
distro='u2204',
1430+
distro='u2404',
14311431
k8s_version=k8s_version,
14321432
kops_channel='alpha',
14331433
name_override=f"kops-aws-cni-{plugin}",
@@ -1539,7 +1539,7 @@ def shorten(version):
15391539
results.append(
15401540
build_test(name_override='kops-aws-upgrade-bug16276-calico',
15411541
cluster_name='bug16276-calico.k8s.local',
1542-
distro='u2204',
1542+
distro='u2404',
15431543
networking='calico',
15441544
k8s_version='stable',
15451545
kops_channel='alpha',
@@ -1819,7 +1819,7 @@ def generate_presubmits_network_plugins():
18191819
optional = True
18201820
results.append(
18211821
presubmit_test(
1822-
distro='u2204arm64',
1822+
distro='u2404arm64',
18231823
k8s_version=k8s_version,
18241824
kops_channel='alpha',
18251825
name=f"pull-kops-e2e-cni-{plugin}",
@@ -1837,7 +1837,7 @@ def generate_presubmits_network_plugins():
18371837
results.append(
18381838
presubmit_test(
18391839
name=f"pull-kops-e2e-cni-{plugin}-ipv6",
1840-
distro='u2204arm64',
1840+
distro='u2404arm64',
18411841
tab_name=f"e2e-{plugin}-ipv6",
18421842
networking=networking_arg,
18431843
extra_flags=['--ipv6',
@@ -1859,7 +1859,7 @@ def generate_presubmits_network_plugins():
18591859
def generate_presubmits_e2e():
18601860
jobs = [
18611861
presubmit_test(
1862-
distro='u2204arm64',
1862+
distro='u2404arm64',
18631863
k8s_version='ci',
18641864
kops_channel='alpha',
18651865
name='pull-kops-e2e-k8s-ci',
@@ -1869,7 +1869,7 @@ def generate_presubmits_e2e():
18691869
focus_regex=r'\[Conformance\]|\[NodeConformance\]',
18701870
),
18711871
presubmit_test(
1872-
distro='u2204arm64',
1872+
distro='u2404arm64',
18731873
k8s_version='ci',
18741874
kops_channel='alpha',
18751875
name='pull-kops-e2e-k8s-ci-ha',
@@ -1975,7 +1975,7 @@ def generate_presubmits_e2e():
19751975
presubmit_test(
19761976
name="pull-kops-e2e-aws-cloud-controller-manager",
19771977
cloud="aws",
1978-
distro="u2204",
1978+
distro="u2404",
19791979
k8s_version="ci",
19801980
extra_flags=['--set=cluster.spec.cloudControllerManager.cloudProvider=aws'],
19811981
tab_name='e2e-ccm',
@@ -1993,7 +1993,7 @@ def generate_presubmits_e2e():
19931993
presubmit_test(
19941994
name="pull-kops-e2e-metrics-server",
19951995
cloud="aws",
1996-
distro="u2204",
1996+
distro="u2404",
19971997
networking="calico",
19981998
scenario="metrics-server",
19991999
tab_name="pull-kops-e2e-aws-metrics-server",
@@ -2002,7 +2002,7 @@ def generate_presubmits_e2e():
20022002
presubmit_test(
20032003
name="pull-kops-e2e-pod-identity-webhook",
20042004
cloud="aws",
2005-
distro="u2204",
2005+
distro="u2404",
20062006
networking="calico",
20072007
scenario="podidentitywebhook",
20082008
tab_name="pull-kops-e2e-aws-pod-identity-webhook",
@@ -2031,7 +2031,7 @@ def generate_presubmits_e2e():
20312031
presubmit_test(
20322032
name="pull-kops-e2e-aws-node-local-dns",
20332033
cloud="aws",
2034-
distro='u2204arm64',
2034+
distro='u2404arm64',
20352035
extra_flags=[
20362036
'--set=cluster.spec.kubeDNS.nodeLocalDNS.enabled=true'
20372037
],
@@ -2047,7 +2047,7 @@ def generate_presubmits_e2e():
20472047
presubmit_test(
20482048
name="pull-kops-e2e-arm64",
20492049
cloud="aws",
2050-
distro="u2204arm64",
2050+
distro="u2404arm64",
20512051
networking="calico",
20522052
extra_flags=["--zones=eu-central-1a",
20532053
"--node-size=m6g.large",
@@ -2057,7 +2057,7 @@ def generate_presubmits_e2e():
20572057
presubmit_test(
20582058
name="pull-kops-e2e-aws-dns-none",
20592059
cloud="aws",
2060-
distro="u2204arm64",
2060+
distro="u2404arm64",
20612061
networking="calico",
20622062
extra_flags=["--dns=none"],
20632063
),
@@ -2072,7 +2072,7 @@ def generate_presubmits_e2e():
20722072
presubmit_test(
20732073
name="pull-kops-e2e-aws-nlb",
20742074
cloud="aws",
2075-
distro="u2204arm64",
2075+
distro="u2404arm64",
20762076
networking="calico",
20772077
extra_flags=[
20782078
"--api-loadbalancer-type=public",
@@ -2083,7 +2083,7 @@ def generate_presubmits_e2e():
20832083
presubmit_test(
20842084
name="pull-kops-e2e-aws-terraform",
20852085
cloud="aws",
2086-
distro="u2204arm64",
2086+
distro="u2404arm64",
20872087
terraform_version="1.5.5",
20882088
extra_flags=[
20892089
"--dns=public",
@@ -2092,7 +2092,7 @@ def generate_presubmits_e2e():
20922092
presubmit_test(
20932093
name="pull-kops-e2e-aws-ipv6-terraform",
20942094
cloud="aws",
2095-
distro="u2204arm64",
2095+
distro="u2404arm64",
20962096
terraform_version="1.5.5",
20972097
extra_flags=[
20982098
'--ipv6',
@@ -2139,7 +2139,7 @@ def generate_presubmits_e2e():
21392139
),
21402140

21412141
presubmit_test(
2142-
distro='u2204arm64',
2142+
distro='u2404arm64',
21432143
name="pull-kops-e2e-aws-karpenter",
21442144
run_if_changed=r'^upup\/models\/cloudup\/resources\/addons\/karpenter\.sh\/',
21452145
networking="cilium",
@@ -2152,7 +2152,7 @@ def generate_presubmits_e2e():
21522152
skip_regex=r'\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|HostPort|two.untainted.nodes',
21532153
),
21542154
presubmit_test(
2155-
distro='u2204arm64',
2155+
distro='u2404arm64',
21562156
name="pull-kops-e2e-aws-ipv6-karpenter",
21572157
#run_if_changed=r'^upup\/models\/cloudup\/resources\/addons\/karpenter\.sh\/',
21582158
networking="cilium",

0 commit comments

Comments
 (0)