Merge pull request k0sproject#4768 from ncopa/ostests-alpine

Add Alpine 3.20 to OS tests matrix

.github/workflows/ostests-matrix.yaml

@@ -23,7 +23,7 @@ on:
         default: >-
           [
             "al2023",
-            "alpine_3_17",
+            "alpine_3_17", "alpine_3_20",
             "centos_7", "centos_8", "centos_9",
             "debian_10", "debian_11", "debian_12",
             "fcos_38",

.github/workflows/ostests-nightly.yaml

@@ -11,7 +11,7 @@ env:
   DISTRIBUTIONS: >-
     [
       ["al2023"],
-      ["alpine_3_17"],
+      ["alpine_3_17", "alpine_3_20"],
       ["centos_7", "centos_8", "centos_9"],
       ["debian_10", "debian_11", "debian_12"],
       ["fcos_38"],

hack/ostests/README.md

@@ -48,7 +48,7 @@ Select the desired cluster configuration for Terraform. Again, just an example,
 other ways described [here][tf-config].
 
 ```shell
-export TF_VAR_os=alpine_3_17
+export TF_VAR_os=alpine_3_20
 export TF_VAR_arch=x86_64
 export TF_VAR_k0s_version=stable
 export TF_VAR_k0s_network_provider=calico
@@ -69,7 +69,8 @@ terraform apply
 ### `os`: Operating system stack
 
 * `al2023`: Amazon Linux 2023
-* `alpine_3_17`: Alpine Linux 3.17
+* `alpine_3_20`: Alpine Linux 3.17
+* `alpine_3_20`: Alpine Linux 3.20
 * `centos_7`: CentOS Linux 7 (Core)
 * `centos_8`: CentOS Stream 8
 * `centos_9`: CentOS Stream 9
@@ -108,7 +109,7 @@ Assuming the AWS credentials are available, it can be used like this:
 
 ```sh
 terraform init
-export TF_VAR_os=alpine_3_17
+export TF_VAR_os=alpine_3_20
 export TF_VAR_k0sctl_skip=true
 terraform apply
 terraform output -json | jq -r '
@@ -165,7 +166,7 @@ workflow] that exposes more knobs and can be triggered manually, e.g. via [gh]:
 
 ```console
 $ gh workflow run ostests-matrix.yaml --ref some/experimental/branch \
-  -f oses='["alpine_3_17"]' \
+  -f oses='["alpine_3_20"]' \
   -f network-providers='["calico"]'
 ✓ Created workflow_dispatch event for ostests-matrix.yaml at some/experimental/branch
 

hack/ostests/modules/os/main.tf

@@ -4,6 +4,7 @@ locals {
   os = {
     al2023      = local.os_al2023
     alpine_3_17 = local.os_alpine_3_17
+    alpine_3_20 = local.os_alpine_3_20
     centos_7    = local.os_centos_7
     centos_8    = local.os_centos_8
     centos_9    = local.os_centos_9

hack/ostests/modules/os/os_alpine_3_17.tf

@@ -43,16 +43,16 @@ locals {
       default = {
         ami_id = one(data.aws_ami.alpine_3_17.*.id)
 
-        user_data    = templatefile("${path.module}/os_alpine_3_17_userdata.tftpl", { worker = true })
-        ready_script = file("${path.module}/os_alpine_3_17_ready.sh")
+        user_data    = templatefile("${path.module}/os_alpine_userdata.tftpl", { worker = true })
+        ready_script = file("${path.module}/os_alpine_ready.sh")
 
         connection = {
           type     = "ssh"
           username = "alpine"
         }
       }
       controller = {
-        user_data = templatefile("${path.module}/os_alpine_3_17_userdata.tftpl", { worker = false })
+        user_data = templatefile("${path.module}/os_alpine_userdata.tftpl", { worker = false })
       }
     }
   }

hack/ostests/modules/os/os_alpine_3_20.tf

@@ -0,0 +1,50 @@
+# https://www.alpinelinux.org/cloud/
+
+data "aws_ami" "alpine_3_20" {
+  count = var.os == "alpine_3_20" ? 1 : 0
+
+  owners      = ["538276064493"]
+  name_regex  = "^alpine-3\\.20\\.\\d+-(aarch64|x86_64)-uefi-tiny($|-.*)"
+  most_recent = true
+
+  filter {
+    name   = "name"
+    values = ["alpine-3.20.*-*-uefi-tiny*"]
+  }
+
+  filter {
+    name   = "architecture"
+    values = [var.arch]
+  }
+
+  filter {
+    name   = "root-device-type"
+    values = ["ebs"]
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+}
+
+locals {
+  os_alpine_3_20 = var.os != "alpine_3_20" ? {} : {
+    node_configs = {
+      default = {
+        ami_id = one(data.aws_ami.alpine_3_20.*.id)
+
+        user_data    = templatefile("${path.module}/os_alpine_userdata.tftpl", { worker = true })
+        ready_script = file("${path.module}/os_alpine_ready.sh")
+
+        connection = {
+          type     = "ssh"
+          username = "alpine"
+        }
+      }
+      controller = {
+        user_data = templatefile("${path.module}/os_alpine_userdata.tftpl", { worker = false })
+      }
+    }
+  }
+}