Merge pull request #402 from dims/move-from-ubuntu-22.04-to-24.04

Switch Ubuntu from 22.04 to 24.04

Author: dims

.github/workflows/update-deps.yml

@@ -15,7 +15,7 @@ permissions:
 jobs:
   update-deps:
     if: ${{ github.repository == 'kubernetes-sigs/provider-aws-test-infra' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout provider-aws-test-infra
         uses: actions/checkout@v4
@@ -51,4 +51,4 @@ jobs:
           labels: ok-to-test
           body: |
             Updating go.mod with latest kubernetes related dependencies...
-          path: src/sigs.k8s.io/provider-aws-test-infra
+          path: src/sigs.k8s.io/provider-aws-test-infra

config/aws-instance-arm64.yaml

@@ -3,7 +3,7 @@ images:
     ssm_path: /aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-arm64
     instance_type: m6g.large
     user_data_file: al2023-6.1.yaml
-  ubuntu-2204:
-    ssm_path: /aws/service/canonical/ubuntu/server/jammy/stable/current/arm64/hvm/ebs-gp2/ami-id
+  ubuntu-2404:
+    ssm_path: /aws/service/canonical/ubuntu/server/noble/stable/current/arm64/hvm/ebs-gp3/ami-id
     instance_type: m6g.large
-    user_data_file: ubuntu2204.yaml
+    user_data_file: ubuntu2404.yaml

config/aws-instance.yaml

@@ -3,7 +3,7 @@ images:
     ssm_path: /aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-x86_64
     instance_type: m6a.large
     user_data_file: al2023-6.1.yaml
-  ubuntu-2204:
-    ssm_path: /aws/service/canonical/ubuntu/server/jammy/stable/current/amd64/hvm/ebs-gp2/ami-id
+  ubuntu-2404:
+    ssm_path: /aws/service/canonical/ubuntu/server/noble/stable/current/amd64/hvm/ebs-gp3/ami-id
     instance_type: m6a.large
-    user_data_file: ubuntu2204.yaml
+    user_data_file: ubuntu2404.yaml

config/ubuntu2204.yaml config/ubuntu2404.yaml

@@ -1,5 +1,5 @@
 #cloud-config
-# This bootstraps a public ubuntu 2204 image from scratch.
+# This bootstraps a public ubuntu 24.04 image from scratch.
 system_info:
   default_user:
     name: ec2-user

kubetest2-ec2/config/ubuntu2204.yaml kubetest2-ec2/config/ubuntu2404.yaml

@@ -9,7 +9,6 @@ packages:
     - nfs-common
     - socat
     - conntrack
-    - awscli
     - net-tools
     - jq
     - python3
@@ -86,6 +85,7 @@ write_files:
     owner: root
     permissions: '0544'
 runcmd:
+  - snap install aws-cli --classic
   - ufw disable || echo "ufw not installed"
   - systemctl stop apparmor
   - systemctl disable apparmor

kubetest2-ec2/pkg/deployer/runner.go

@@ -120,9 +120,9 @@ func (a *AWSRunner) Validate() error {
 				a.deployer.UserDataFile = "al2023.sh"
 			}
 		case "ubuntu", "":
-			path = "/aws/service/canonical/ubuntu/server/jammy/stable/current/" + arch + "/hvm/ebs-gp2/ami-id"
+			path = "/aws/service/canonical/ubuntu/server/noble/stable/current/" + arch + "/hvm/ebs-gp3/ami-id"
 			if a.deployer.UserDataFile == "" {
-				a.deployer.UserDataFile = "ubuntu2204.yaml"
+				a.deployer.UserDataFile = "ubuntu2404.yaml"
 			}
 		default:
 			return fmt.Errorf("unrecognized parameter --image : %s", a.deployer.Image)
@@ -182,9 +182,9 @@ func (a *AWSRunner) Validate() error {
 				a.deployer.WorkerUserDataFile = "al2023.sh"
 			}
 		case "ubuntu", "":
-			path = "/aws/service/canonical/ubuntu/server/jammy/stable/current/" + arch + "/hvm/ebs-gp2/ami-id"
+			path = "/aws/service/canonical/ubuntu/server/noble/stable/current/" + arch + "/hvm/ebs-gp3/ami-id"
 			if a.deployer.WorkerUserDataFile == "" {
-				a.deployer.WorkerUserDataFile = "ubuntu2204.yaml"
+				a.deployer.WorkerUserDataFile = "ubuntu2404.yaml"
 			}
 		default:
 			return fmt.Errorf("unrecognized parameter --worker-image : %s", a.deployer.WorkerImage)
@@ -462,11 +462,11 @@ func (a *AWSRunner) getUserData(dataFile string, version string, controlPlane bo
 			userdata = string(userDataBytes)
 		}
 	} else {
-		userDataBytes, err := config.ConfigFS.ReadFile("ubuntu2204.yaml")
+		userDataBytes, err := config.ConfigFS.ReadFile("ubuntu2404.yaml")
 		if err != nil {
-			return "", fmt.Errorf("error reading embedded ubuntu2204.yaml: %w", err)
+			return "", fmt.Errorf("error reading embedded ubuntu2404.yaml: %w", err)
 		}
-		klog.Infof("loading user data from embedded file: ubuntu2204.yaml")
+		klog.Infof("loading user data from embedded file: ubuntu2404.yaml")
 		userdata = string(userDataBytes)
 	}