Merge pull request #35562 from hakman/pull-kops-e2e-cni-amazonvpc

kOps: Use Ubuntu 24.04 for pull-kops-e2e-cni-amazonvpc

Author: k8s-ci-robot

config/jobs/kubernetes/kops/build_jobs.py

@@ -1866,8 +1866,6 @@ def generate_presubmits_network_plugins():
     for plugin, run_if_changed in plugins.items():
         k8s_version = 'stable'
         networking_arg = plugin
-        master_size = "c6g.large"
-        node_size = "t4g.large"
         optional = False
         distro = 'u2404arm64'
         if plugin == 'flannel':
@@ -1876,10 +1874,16 @@ def generate_presubmits_network_plugins():
             networking_arg = 'kube-router'
             k8s_version = 'ci'
             optional = True
+        aws_extra_flags = [
+            "--master-size=c6g.large",
+            "--node-size=t4g.large"
+        ]
         if plugin == 'amazonvpc':
-            distro = 'al2023arm64'
-            master_size = "r6g.xlarge"
-            node_size = "r6g.xlarge"
+            aws_extra_flags.extend([
+                "--set=cluster.spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true",
+                "--set=cluster.spec.networking.amazonVPC.env=MINIMUM_IP_TARGET=80",
+                "--set=cluster.spec.networking.amazonVPC.env=WARM_IP_TARGET=10",
+            ])
         if plugin in ['cilium-eni']:
             distro = 'u2204arm64' # pinned to 22.04 because of network issues with 24.04 and these CNIs
         results.append(
@@ -1890,10 +1894,7 @@ def generate_presubmits_network_plugins():
                 name=f"pull-kops-e2e-cni-{plugin}",
                 tab_name=f"e2e-{plugin}",
                 networking=networking_arg,
-                extra_flags=[
-                    f"--master-size={master_size}",
-                    f"--node-size={node_size}"
-                ],
+                extra_flags=aws_extra_flags,
                 run_if_changed=run_if_changed,
                 optional=optional,
             )

config/jobs/kubernetes/kops/kops-presubmits-network-plugins.yaml

@@ -3,7 +3,7 @@
 presubmits:
   kubernetes/kops:
 
-# {"cloud": "aws", "distro": "al2023arm64", "extra_flags": "--master-size=r6g.xlarge --node-size=r6g.xlarge --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "amazonvpc"}
+# {"cloud": "aws", "distro": "u2404arm64", "extra_flags": "--master-size=c6g.large --node-size=t4g.large --set=cluster.spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true --set=cluster.spec.networking.amazonVPC.env=MINIMUM_IP_TARGET=80 --set=cluster.spec.networking.amazonVPC.env=WARM_IP_TARGET=10 --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "amazonvpc"}
   - name: pull-kops-e2e-cni-amazonvpc
     cluster: k8s-infra-kops-prow-build
     branches:
@@ -36,7 +36,7 @@ presubmits:
             -v 2 \
             --up --build --down \
             --cloud-provider=aws \
-            --create-args="--image='137112412989/al2023-ami-2023.8.20250915.0-kernel-6.1-arm64' --channel=alpha --networking=amazonvpc --master-size=r6g.xlarge --node-size=r6g.xlarge --discovery-store=s3://k8s-kops-prow/discovery" \
+            --create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250920' --channel=alpha --networking=amazonvpc --master-size=c6g.large --node-size=t4g.large --set=cluster.spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true --set=cluster.spec.networking.amazonVPC.env=MINIMUM_IP_TARGET=80 --set=cluster.spec.networking.amazonVPC.env=WARM_IP_TARGET=10 --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 \
@@ -50,7 +50,7 @@ presubmits:
         - name: KUBE_SSH_KEY_PATH
           value: /etc/aws-ssh/aws-ssh-private
         - name: KUBE_SSH_USER
-          value: ec2-user
+          value: ubuntu
         - name: GOPATH
           value: /home/prow/go
         resources:
@@ -62,8 +62,8 @@ presubmits:
             memory: 6Gi
     annotations:
       test.kops.k8s.io/cloud: aws
-      test.kops.k8s.io/distro: al2023arm64
-      test.kops.k8s.io/extra_flags: --master-size=r6g.xlarge --node-size=r6g.xlarge --discovery-store=s3://k8s-kops-prow/discovery
+      test.kops.k8s.io/distro: u2404arm64
+      test.kops.k8s.io/extra_flags: --master-size=c6g.large --node-size=t4g.large --set=cluster.spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true --set=cluster.spec.networking.amazonVPC.env=MINIMUM_IP_TARGET=80 --set=cluster.spec.networking.amazonVPC.env=WARM_IP_TARGET=10 --discovery-store=s3://k8s-kops-prow/discovery
       test.kops.k8s.io/k8s_version: stable
       test.kops.k8s.io/kops_channel: alpha
       test.kops.k8s.io/networking: amazonvpc