Merge pull request #31308 from borg-land/migrate-kops-community-gce

Migrate the remaining kops gce e2e jobs to community cluster
kubernetes · Nov 24, 2023 · 59f3faa · 59f3faa
2 parents f0b96b3 + 0225ce1
commit 59f3faa
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -464,6 +464,7 @@ def generate_grid():
                                    k8s_version=k8s_version,
                                    kops_version=kops_version,
                                    networking=networking,
+                                   build_cluster="k8s-infra-prow-build",
                                    extra_flags=["--gce-service-account=default"], # Workaround for test-infra#24747 # pylint: disable=line-too-long
                                    )
                     )
@@ -513,6 +514,7 @@ def generate_misc():
                    cloud="gce",
                    k8s_version="ci",
                    networking="cilium",
+                   build_cluster="k8s-infra-prow-build",
                    runs_per_day=1,
                    extra_flags=["--gce-service-account=default"],
                    extra_dashboards=['kops-network-plugins']),
@@ -860,7 +862,7 @@ def generate_misc():
                    k8s_version="ci",
                    kops_version="https://storage.googleapis.com/kops-ci/bin/latest-ci.txt",
                    kops_channel="alpha",
-                   build_cluster="default",
+                   build_cluster="k8s-infra-prow-build",
                    extra_flags=[
                        "--image=cos-cloud/cos-105-17412-156-49",
                        "--set=spec.nodeProblemDetector.enabled=true",

diff --git a/config/jobs/kubernetes/kops/kops-periodics-gce.yaml b/config/jobs/kubernetes/kops/kops-periodics-gce.yaml
@@ -3,6 +3,7 @@ periodics:
 - cron: '3 1-23/3 * * *'
   labels:
     preset-k8s-ssh: "true"
+  cluster: k8s-infra-prow-build
   name: e2e-kops-gce-stable
   decorate: true
   decoration_config:
@@ -45,10 +46,11 @@ periodics:
       imagePullPolicy: Always
       resources:
         limits:
-          memory: 3Gi
+          cpu: "4"
+          memory: 6Gi
         requests:
-          cpu: "2"
-          memory: 3Gi
+          cpu: "4"
+          memory: 6Gi
   annotations:
     test.kops.k8s.io/cloud: gce
     test.kops.k8s.io/container_runtime: containerd
@@ -66,6 +68,7 @@ periodics:
 - cron: '48 1-23/3 * * *'
   labels:
     preset-k8s-ssh: "true"
+  cluster: k8s-infra-prow-build
   name: e2e-kops-gce-latest
   decorate: true
   decoration_config:
@@ -110,10 +113,11 @@ periodics:
       imagePullPolicy: Always
       resources:
         limits:
-          memory: 3Gi
+          cpu: "4"
+          memory: 6Gi
         requests:
-          cpu: "2"
-          memory: 3Gi
+          cpu: "4"
+          memory: 6Gi
   annotations:
     test.kops.k8s.io/cloud: gce
     test.kops.k8s.io/container_runtime: containerd

diff --git a/config/jobs/kubernetes/kops/kops-periodics-grid.yaml b/config/jobs/kubernetes/kops/kops-periodics-grid.yaml
@@ -27836,7 +27836,7 @@ periodics:
   cron: '3 4-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -27900,7 +27900,7 @@ periodics:
   cron: '45 6-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -27964,7 +27964,7 @@ periodics:
   cron: '31 0-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28028,7 +28028,7 @@ periodics:
   cron: '2 1-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28092,7 +28092,7 @@ periodics:
   cron: '41 0-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28156,7 +28156,7 @@ periodics:
   cron: '27 2-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28220,7 +28220,7 @@ periodics:
   cron: '33 4-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28284,7 +28284,7 @@ periodics:
   cron: '52 5-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28348,7 +28348,7 @@ periodics:
   cron: '31 2-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28412,7 +28412,7 @@ periodics:
   cron: '53 0-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28476,7 +28476,7 @@ periodics:
   cron: '43 6-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28540,7 +28540,7 @@ periodics:
   cron: '22 7-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28604,7 +28604,7 @@ periodics:
   cron: '46 0-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28668,7 +28668,7 @@ periodics:
   cron: '32 2-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28732,7 +28732,7 @@ periodics:
   cron: '34 4-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -28796,7 +28796,7 @@ periodics:
   cron: '55 5-23/8 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m

diff --git a/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml b/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml
@@ -205,7 +205,7 @@ periodics:
   cron: '22 12-23/24 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m
@@ -2066,7 +2066,7 @@ periodics:
   cron: '16 1-23/3 * * *'
   labels:
     preset-k8s-ssh: "true"
-  cluster: default
+  cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
     timeout: 90m