kOps: Use AL2023 for pull-kops-e2e-cni-amazonvpc

Author: hakman

config/jobs/kubernetes/kops/build_jobs.py

@@ -1877,6 +1877,7 @@ def generate_presubmits_network_plugins():
             k8s_version = 'ci'
             optional = True
         if plugin == 'amazonvpc':
+            distro = 'al2023arm64'
             master_size = "r6g.xlarge"
             node_size = "r6g.xlarge"
         if plugin in ['cilium-eni']:

config/jobs/kubernetes/kops/helpers.py

@@ -229,6 +229,7 @@ def latest_gce_image(project, family, arch="X86_64"):
 
 distro_images = {
     'al2023': latest_aws_image('137112412989', 'al2023-ami-2*-kernel-6.1-x86_64'),
+    'al2023arm64': latest_aws_image('137112412989', 'al2023-ami-2*-kernel-6.1-arm64', 'arm64'),
     'amzn2': latest_aws_image('137112412989', 'amzn2-ami-kernel-5.10-hvm-*-x86_64-gp2'),
     'deb11': latest_aws_image('136693071363', 'debian-11-amd64-*'),
     'deb12': latest_aws_image('136693071363', 'debian-12-amd64-*'),
@@ -247,6 +248,7 @@ def latest_gce_image(project, family, arch="X86_64"):
 
 distros_ssh_user = {
     'al2023': 'ec2-user',
+    'al2023arm64': 'ec2-user',
     'amzn2': 'ec2-user',
     'deb10': 'admin',
     'deb11': 'admin',

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

@@ -3,7 +3,7 @@
 presubmits:
   kubernetes/kops:
 
-# {"cloud": "aws", "distro": "u2404arm64", "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": "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"}
   - 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='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250920' --channel=alpha --networking=amazonvpc --master-size=r6g.xlarge --node-size=r6g.xlarge --discovery-store=s3://k8s-kops-prow/discovery" \
+            --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" \
             --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: ubuntu
+          value: ec2-user
         - name: GOPATH
           value: /home/prow/go
         resources:
@@ -62,7 +62,7 @@ presubmits:
             memory: 6Gi
     annotations:
       test.kops.k8s.io/cloud: aws
-      test.kops.k8s.io/distro: u2404arm64
+      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/k8s_version: stable
       test.kops.k8s.io/kops_channel: alpha

config/jobs/kubernetes/kops/pinned.list

@@ -8,6 +8,7 @@ gce://images/ubuntu-os-cloud/ubuntu-2404-lts-arm64:ARM64=ubuntu-2404-noble-arm64
 gce://images/ubuntu-os-cloud/ubuntu-minimal-2404-lts-amd64:X86_64=ubuntu-minimal-2404-noble-amd64-v20250918
 gce://images/ubuntu-os-cloud/ubuntu-minimal-2404-lts-arm64:ARM64=ubuntu-minimal-2404-noble-arm64-v20250918
 aws://images/137112412989/al2023-ami-2*-kernel-6.1-x86_64:x86_64=137112412989/al2023-ami-2023.8.20250915.0-kernel-6.1-x86_64
+aws://images/137112412989/al2023-ami-2*-kernel-6.1-arm64:arm64=137112412989/al2023-ami-2023.8.20250915.0-kernel-6.1-arm64
 aws://images/137112412989/amzn2-ami-kernel-5.10-hvm-*-x86_64-gp2:x86_64=137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20250915.0-x86_64-gp2
 aws://images/136693071363/debian-11-amd64-*:x86_64=136693071363/debian-11-amd64-20250801-2191
 aws://images/136693071363/debian-12-amd64-*:x86_64=136693071363/debian-12-amd64-20250909-2230