Merge pull request #35866 from upodroid/kops-hyperdisk-patch

use k8s ci builds for hyperdisk job

Author: k8s-ci-robot

config/jobs/kubernetes/kops/build_jobs.py

@@ -2094,11 +2094,11 @@ def generate_presubmits_e2e():
         ),
         presubmit_test(
             cloud='gce',
-            k8s_version='stable',
+            k8s_version='ci',
             kops_channel='alpha',
-            name='pull-kops-e2e-k8s-gce-cilium-hyperdisk',
-            networking='cilium',
-            tab_name='e2e-gce-cilium-hyperdisk',
+            name='pull-kops-e2e-k8s-gce-kindnet-hyperdisk',
+            networking='kindnet',
+            tab_name='e2e-gce-kindnet-hyperdisk',
             always_run=False,
             extra_flags=[
                 "--zones=us-east1-b",

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

@@ -535,8 +535,8 @@ presubmits:
       testgrid-days-of-results: '90'
       testgrid-tab-name: e2e-gce-cilium
 
-# {"cloud": "gce", "distro": "u2404", "extra_flags": "--zones=us-east1-b --node-size=c4-standard-4 --master-size=c4-standard-2 --set spec.cloudProvider.gce.pdCSIDriver.defaultStorageClassName=balanced-storage --set spec.etcdClusters[*].etcdMembers[*].volumeIOPS=10000 --set spec.etcdClusters[*].etcdMembers[*].volumeThroughput=1000 --set spec.etcdClusters[*].etcdMembers[*].volumeSize=60 --set spec.etcdClusters[*].etcdMembers[*].volumeType=hyperdisk-balanced --gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
-  - name: pull-kops-e2e-k8s-gce-cilium-hyperdisk
+# {"cloud": "gce", "distro": "u2404", "extra_flags": "--zones=us-east1-b --node-size=c4-standard-4 --master-size=c4-standard-2 --set spec.cloudProvider.gce.pdCSIDriver.defaultStorageClassName=balanced-storage --set spec.etcdClusters[*].etcdMembers[*].volumeIOPS=10000 --set spec.etcdClusters[*].etcdMembers[*].volumeThroughput=1000 --set spec.etcdClusters[*].etcdMembers[*].volumeSize=60 --set spec.etcdClusters[*].etcdMembers[*].volumeType=hyperdisk-balanced --gce-service-account=default", "k8s_version": "ci", "kops_channel": "alpha", "networking": "kindnet"}
+  - name: pull-kops-e2e-k8s-gce-kindnet-hyperdisk
     cluster: k8s-infra-prow-build
     branches:
     - master
@@ -566,8 +566,8 @@ presubmits:
             --up --build --down \
             --cloud-provider=gce \
             --admin-access=0.0.0.0/0 \
-            --create-args="--image='ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20251021' --channel=alpha --networking=cilium --zones=us-east1-b --node-size=c4-standard-4 --master-size=c4-standard-2 --set spec.cloudProvider.gce.pdCSIDriver.defaultStorageClassName=balanced-storage --set spec.etcdClusters[*].etcdMembers[*].volumeIOPS=10000 --set spec.etcdClusters[*].etcdMembers[*].volumeThroughput=1000 --set spec.etcdClusters[*].etcdMembers[*].volumeSize=60 --set spec.etcdClusters[*].etcdMembers[*].volumeType=hyperdisk-balanced --gce-service-account=default" \
-            --kubernetes-version=https://dl.k8s.io/release/stable.txt \
+            --create-args="--image='ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20251021' --channel=alpha --networking=kindnet --zones=us-east1-b --node-size=c4-standard-4 --master-size=c4-standard-2 --set spec.cloudProvider.gce.pdCSIDriver.defaultStorageClassName=balanced-storage --set spec.etcdClusters[*].etcdMembers[*].volumeIOPS=10000 --set spec.etcdClusters[*].etcdMembers[*].volumeThroughput=1000 --set spec.etcdClusters[*].etcdMembers[*].volumeSize=60 --set spec.etcdClusters[*].etcdMembers[*].volumeType=hyperdisk-balanced --gce-service-account=default" \
+            --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
             --kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
             --control-plane-instance-group-overrides=spec.rootVolume.type=hyperdisk-balanced \
             --node-instance-group-overrides=spec.rootVolume.type=hyperdisk-balanced \
@@ -580,7 +580,9 @@ presubmits:
             --test=kops \
             -- \
             --test-args="-test.timeout=60m" \
-            --test-package-marker=stable.txt \
+            --test-package-url=https://storage.googleapis.com/k8s-release-dev \
+            --test-package-dir=ci \
+            --test-package-marker=latest.txt \
             --parallel=25
         securityContext:
           privileged: true
@@ -602,12 +604,12 @@ presubmits:
       test.kops.k8s.io/cloud: gce
       test.kops.k8s.io/distro: u2404
       test.kops.k8s.io/extra_flags: --zones=us-east1-b --node-size=c4-standard-4 --master-size=c4-standard-2 --set spec.cloudProvider.gce.pdCSIDriver.defaultStorageClassName=balanced-storage --set spec.etcdClusters[*].etcdMembers[*].volumeIOPS=10000 --set spec.etcdClusters[*].etcdMembers[*].volumeThroughput=1000 --set spec.etcdClusters[*].etcdMembers[*].volumeSize=60 --set spec.etcdClusters[*].etcdMembers[*].volumeType=hyperdisk-balanced --gce-service-account=default
-      test.kops.k8s.io/k8s_version: stable
+      test.kops.k8s.io/k8s_version: ci
       test.kops.k8s.io/kops_channel: alpha
-      test.kops.k8s.io/networking: cilium
+      test.kops.k8s.io/networking: kindnet
       testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
       testgrid-days-of-results: '90'
-      testgrid-tab-name: e2e-gce-cilium-hyperdisk
+      testgrid-tab-name: e2e-gce-kindnet-hyperdisk
 
 # {"cloud": "gce", "distro": "u2404", "extra_flags": "--gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium-etcd"}
   - name: pull-kops-e2e-k8s-gce-cilium-etcd