Uplift Ubuntu to 24.04

Signed-off-by: erjavaskivuori <[email protected]>
Signed-off-by: Sunnatillo <[email protected]>

Author: erjavaskivuori

docs/api.md

@@ -413,10 +413,10 @@ metadata:
 spec:
   automatedCleaningMode: metadata
   image:
-    checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum
+    checksum: http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum
     checksumType: sha256
     format: raw
-    url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img
+    url: http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.31.0-raw.img
   hostSelector:
     matchLabels:
       key1: value1
@@ -557,10 +557,17 @@ spec:
     spec:
       automatedCleaningMode: metadata
       image:
+<<<<<<< HEAD
         checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum
         checksumType: sha256
         format: raw
         url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img
+=======
+        checksum: http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum
+        checksumType: sha256
+        format: raw
+        url: http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.31.0-raw.img
+>>>>>>> ccb5b5d4 (Uplift Ubuntu to 24.04)
       hostSelector:
         matchLabels:
           key1: value1

examples/generate.sh

@@ -27,8 +27,8 @@ export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
 export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.31.0}"
 export CLUSTER_APIENDPOINT_HOST="${CLUSTER_APIENDPOINT_HOST:-192.168.111.249}"
 export CLUSTER_APIENDPOINT_PORT="${CLUSTER_APIENDPOINT_PORT:-6443}"
-export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img}"
-export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum}"
+export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.31.0-raw.img}"
+export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum}"
 export IMAGE_CHECKSUM_TYPE="${IMAGE_CHECKSUM_TYPE:-sha256}"
 export IMAGE_FORMAT="${IMAGE_FORMAT:-raw}"
 

scripts/environment.sh

@@ -24,10 +24,10 @@ function os_check() {
   export DISTRO="${ID}${VERSION_ID%.*}"
   export OS="${ID}"
   export OS_VERSION_ID=$VERSION_ID
-  export SUPPORTED_DISTROS=(centos8 centos9 rhel8 ubuntu20 ubuntu22)
+  export SUPPORTED_DISTROS=(centos8 centos9 rhel8 ubuntu20 ubuntu22 ubuntu24)
 
   if [[ ! "${SUPPORTED_DISTROS[*]}" =~ $DISTRO ]]; then
-    echo "Supported OS distros for the host are: CentOS Stream 8/9 or RHEL8/9 or Ubuntu20.04 or Ubuntu22.04"
+    echo "Supported OS distros for the host are: CentOS Stream 8/9 or RHEL8/9 or Ubuntu20.04 or Ubuntu22.04 or Ubuntu24.04"
     exit 1
   fi
 }

test/e2e/common.go

@@ -158,7 +158,7 @@ func EnsureImage(k8sVersion string) (imageURL string, imageChecksum string) {
 	Expect(osType).To(BeElementOf([]string{osTypeUbuntu, osTypeCentos}))
 	imageNamePrefix := "CENTOS_9_NODE_IMAGE_K8S"
 	if osType != osTypeCentos {
-		imageNamePrefix = "UBUNTU_22.04_NODE_IMAGE_K8S"
+		imageNamePrefix = "UBUNTU_24.04_NODE_IMAGE_K8S"
 	}
 	imageName := fmt.Sprintf("%s_%s.qcow2", imageNamePrefix, k8sVersion)
 	rawImageName := fmt.Sprintf("%s_%s-raw.img", imageNamePrefix, k8sVersion)