Merge pull request #35656 from justinsb/add_kops_scenario_test_for_clusterapi

kOps: add test for clusterapi

Author: k8s-ci-robot

config/jobs/kubernetes/kops/build_jobs.py

@@ -2403,6 +2403,14 @@ def generate_presubmits_e2e():
             test_timeout_minutes=70,
             optional=True,
         ),
+
+        presubmit_test(
+            name="pull-kops-scenario-clusterapi-gcp",
+            cloud="gce",
+            k8s_version="stable",
+            scenario="clusterapi",
+            optional=True
+        ),
     ]
 
     return jobs

config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml

@@ -1,5 +1,5 @@
 # Test jobs generated by build_jobs.py (do not manually edit)
-# 40 jobs
+# 41 jobs
 presubmits:
   kubernetes/kops:
 
@@ -851,6 +851,9 @@ presubmits:
           requests:
             cpu: "6"
             memory: "16Gi"
+          limits:
+            cpu: "6"
+            memory: "16Gi"
     annotations:
       test.kops.k8s.io/cloud: aws
       test.kops.k8s.io/distro: u2204
@@ -907,6 +910,9 @@ presubmits:
           requests:
             cpu: "6"
             memory: "16Gi"
+          limits:
+            cpu: "6"
+            memory: "16Gi"
     annotations:
       test.kops.k8s.io/cloud: aws
       test.kops.k8s.io/distro: u2404
@@ -963,6 +969,9 @@ presubmits:
           requests:
             cpu: "6"
             memory: "16Gi"
+          limits:
+            cpu: "6"
+            memory: "16Gi"
     annotations:
       test.kops.k8s.io/cloud: aws
       test.kops.k8s.io/distro: u2404
@@ -2073,6 +2082,9 @@ presubmits:
           requests:
             cpu: "6"
             memory: "16Gi"
+          limits:
+            cpu: "6"
+            memory: "16Gi"
     annotations:
       test.kops.k8s.io/cloud: aws
       test.kops.k8s.io/distro: u2404
@@ -2280,6 +2292,9 @@ presubmits:
           requests:
             cpu: "6"
             memory: "16Gi"
+          limits:
+            cpu: "6"
+            memory: "16Gi"
     annotations:
       test.kops.k8s.io/cloud: aws
       test.kops.k8s.io/distro: u2204
@@ -2335,6 +2350,9 @@ presubmits:
           requests:
             cpu: "6"
             memory: "16Gi"
+          limits:
+            cpu: "6"
+            memory: "16Gi"
     annotations:
       test.kops.k8s.io/cloud: aws
       test.kops.k8s.io/distro: u2404
@@ -2621,3 +2639,55 @@ presubmits:
       testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
       testgrid-days-of-results: '90'
       testgrid-tab-name: pull-kops-kubernetes-e2e-cos-gce-slow
+
+# {"cloud": "gce", "distro": "u2404", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
+  - name: pull-kops-scenario-clusterapi-gcp
+    cluster: k8s-infra-prow-build
+    branches:
+    - master
+    always_run: false
+    optional: true
+    skip_report: false
+    labels:
+      preset-k8s-ssh: "true"
+    max_concurrency: 1
+    decorate: true
+    decoration_config:
+      timeout: 90m
+    path_alias: k8s.io/kops
+    spec:
+      serviceAccountName: k8s-kops-test
+      containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
+        imagePullPolicy: Always
+        command:
+        - runner.sh
+        args:
+        - ./tests/e2e/scenarios/clusterapi/run-test.sh
+        securityContext:
+          privileged: true
+        env:
+        - name: KUBE_SSH_KEY_PATH
+          value: /etc/ssh-key-secret/ssh-private
+        - name: KUBE_SSH_USER
+          value: prow
+        - name: GOPATH
+          value: /home/prow/go
+        - name: CLOUD_PROVIDER
+          value: "gce"
+        resources:
+          requests:
+            cpu: "6"
+            memory: "16Gi"
+          limits:
+            cpu: "6"
+            memory: "16Gi"
+    annotations:
+      test.kops.k8s.io/cloud: gce
+      test.kops.k8s.io/distro: u2404
+      test.kops.k8s.io/k8s_version: stable
+      test.kops.k8s.io/kops_channel: alpha
+      test.kops.k8s.io/networking: cilium
+      testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
+      testgrid-days-of-results: '90'
+      testgrid-tab-name: pull-kops-scenario-clusterapi-gcp

config/jobs/kubernetes/kops/templates/presubmit-scenario.yaml.jinja

@@ -65,8 +65,6 @@
           requests:
             cpu: "6"
             memory: "16Gi"
-          {%- if scenario == 'scalability' %}
           limits:
             cpu: "6"
             memory: "16Gi"
-          {%- endif %}