Merge pull request #32243 from ameukam/revert-32238

Revert "kops: migrate presubmits to community infra"
kubernetes · Mar 12, 2024 · 731d45f · 731d45f
2 parents da98007 + 375160f
commit 731d45f
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 77 deletions.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -1414,8 +1414,6 @@ def generate_presubmits_distros():
             ]
         results.append(
             presubmit_test(
-                cloud='aws',
-                build_cluster='k8s-infra-kops-prow-build',
                 distro=distro_short,
                 networking='calico',
                 k8s_version='stable',
@@ -1838,8 +1836,6 @@ def generate_presubmits_network_plugins():
             optional = True
         results.append(
             presubmit_test(
-                cloud='aws',
-                build_cluster='k8s-infra-kops-prow-build',
                 distro='u2204arm64',
                 k8s_version=k8s_version,
                 kops_channel='alpha',
@@ -1858,7 +1854,6 @@ def generate_presubmits_network_plugins():
             results.append(
                 presubmit_test(
                     name=f"pull-kops-e2e-cni-{plugin}-ipv6",
-                    build_cluster='k8s-infra-kops-prow-build',
                     distro='u2204arm64',
                     tab_name=f"e2e-{plugin}-ipv6",
                     networking=networking_arg,
@@ -1881,7 +1876,6 @@ def generate_presubmits_network_plugins():
 def generate_presubmits_e2e():
     jobs = [
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='u2204arm64',
             k8s_version='ci',
             kops_channel='alpha',
@@ -1892,7 +1886,6 @@ def generate_presubmits_e2e():
             focus_regex=r'\[Conformance\]|\[NodeConformance\]',
         ),
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='u2204arm64',
             k8s_version='ci',
             kops_channel='alpha',
@@ -1907,7 +1900,6 @@ def generate_presubmits_e2e():
             focus_regex=r'\[Conformance\]|\[NodeConformance\]',
         ),
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='channels',
             k8s_version='stable',
             kops_channel='alpha',
@@ -1917,7 +1909,6 @@ def generate_presubmits_e2e():
             always_run=True,
         ),
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='al2023',
             k8s_version='stable',
             kops_channel='alpha',
@@ -2009,7 +2000,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-cloud-controller-manager",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204",
             k8s_version="ci",
             extra_flags=['--set=cluster.spec.cloudControllerManager.cloudProvider=aws'],
@@ -2019,7 +2009,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-load-balancer-controller",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2004",
             networking="calico",
             scenario="aws-lb-controller",
@@ -2029,7 +2018,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-addon-resource-tracking",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204",
             networking="calico",
             scenario="addon-resource-tracking",
@@ -2039,7 +2027,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-metrics-server",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204",
             networking="calico",
             scenario="metrics-server",
@@ -2049,7 +2036,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-pod-identity-webhook",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204",
             networking="calico",
             scenario="podidentitywebhook",
@@ -2059,7 +2045,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-external-dns",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             networking="calico",
             extra_flags=[
                 '--set=cluster.spec.externalDNS.provider=external-dns',
@@ -2069,7 +2054,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-ipv6-external-dns",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             networking="calico",
             extra_flags=[
                 '--ipv6',
@@ -2081,7 +2065,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-node-local-dns",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro='u2204arm64',
             extra_flags=[
                 '--set=cluster.spec.kubeDNS.nodeLocalDNS.enabled=true'
@@ -2091,15 +2074,13 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-apiserver-nodes",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             template_path="/home/prow/go/src/k8s.io/kops/tests/e2e/templates/apiserver.yaml.tmpl",
             feature_flags=['APIServerNodes']
         ),
 
         presubmit_test(
             name="pull-kops-e2e-arm64",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204arm64",
             networking="calico",
             extra_flags=["--zones=eu-central-1a",
@@ -2110,7 +2091,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-dns-none",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204arm64",
             networking="calico",
             extra_flags=["--dns=none"],
@@ -2127,7 +2107,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-nlb",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204arm64",
             networking="calico",
             extra_flags=[
@@ -2139,7 +2118,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-terraform",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204arm64",
             terraform_version="1.5.5",
             extra_flags=[
@@ -2149,7 +2127,6 @@ def generate_presubmits_e2e():
         presubmit_test(
             name="pull-kops-e2e-aws-ipv6-terraform",
             cloud="aws",
-            build_cluster='k8s-infra-kops-prow-build',
             distro="u2204arm64",
             terraform_version="1.5.5",
             extra_flags=[
@@ -2160,7 +2137,6 @@ def generate_presubmits_e2e():
         ),
 
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='channels',
             branch='release-1.28',
             k8s_version='1.28',
@@ -2171,7 +2147,6 @@ def generate_presubmits_e2e():
             always_run=True,
         ),
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='channels',
             branch='release-1.27',
             k8s_version='1.27',
@@ -2182,7 +2157,6 @@ def generate_presubmits_e2e():
             always_run=True,
         ),
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='channels',
             branch='release-1.26',
             k8s_version='1.26',
@@ -2194,7 +2168,6 @@ def generate_presubmits_e2e():
         ),
 
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='u2204arm64',
             name="pull-kops-e2e-aws-karpenter",
             run_if_changed=r'^upup\/models\/cloudup\/resources\/addons\/karpenter\.sh\/',
@@ -2208,7 +2181,6 @@ def generate_presubmits_e2e():
             skip_regex=r'\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|HostPort|two.untainted.nodes',
         ),
         presubmit_test(
-            build_cluster='k8s-infra-kops-prow-build',
             distro='u2204arm64',
             name="pull-kops-e2e-aws-ipv6-karpenter",
             #run_if_changed=r'^upup\/models\/cloudup\/resources\/addons\/karpenter\.sh\/',

diff --git a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml
@@ -480,7 +480,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20240306.2-x86_64-gp2' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20240223.0-x86_64-gp2' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://dl.k8s.io/release/stable.txt \
           --test=kops \

diff --git a/config/jobs/kubernetes/kops/kops-presubmits-distros.yaml b/config/jobs/kubernetes/kops/kops-presubmits-distros.yaml
@@ -5,7 +5,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-debian10
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -72,7 +72,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "deb11", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-debian11
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -139,7 +139,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "deb12", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-debian12
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -206,7 +206,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-ubuntu2004
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -273,7 +273,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "u2004arm64", "extra_flags": "--zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-ubuntu2004arm64
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -340,7 +340,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-ubuntu2204
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -407,7 +407,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-ubuntu2204arm64
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -474,7 +474,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-amazonlinux2
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -504,7 +504,7 @@ presubmits:
             -v 2 \
             --up --build --down \
             --cloud-provider=aws \
-            --create-args="--image='137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20240306.2-x86_64-gp2' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
+            --create-args="--image='137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20240223.0-x86_64-gp2' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
             --kubernetes-version=https://dl.k8s.io/release/stable.txt \
             --kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
             --test=kops \
@@ -541,7 +541,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "al2023", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-al2023
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -608,7 +608,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-rhel8
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -675,7 +675,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "rhel9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-rhel9
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -742,7 +742,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "rocky8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-rocky8
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false
@@ -809,7 +809,7 @@ presubmits:
 
 # {"cloud": "aws", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-aws-distro-flatcar
-    cluster: k8s-infra-kops-prow-build
+    cluster: default
     branches:
     - master
     always_run: false