Skip to content

Move from Alpine 3.23 to 3.24 in the OS tests #7825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twz123 merged 1 commit into from
Jun 19, 2026
Merged

Move from Alpine 3.23 to 3.24 in the OS tests #7825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ostests-matrix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ on:
default: >-
[
"al2023",
"alpine_3_21", "alpine_3_23",
"alpine_3_21", "alpine_3_24",
"centos_9", "centos_10",
"debian_11", "debian_12",
"fcos_stable",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ostests-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
DISTRIBUTIONS: >-
[
["al2023"],
["alpine_3_21", "alpine_3_23"],
["alpine_3_21", "alpine_3_24"],
["centos_9", "centos_10"],
["debian_11", "debian_12"],
["fcos_stable"],
Expand Down
8 changes: 4 additions & 4 deletions hack/ostests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ other methods of passing configuration options are covered in the [official
OpenTofu documentation][tf-config].

```shell
export TF_VAR_os=alpine_3_23
export TF_VAR_os=alpine_3_24
export TF_VAR_arch=x86_64
export TF_VAR_k0s_version=stable
export TF_VAR_k0s_network_provider=calico
Expand All @@ -76,7 +76,7 @@ tofu apply

* `al2023`: Amazon Linux 2023
* `alpine_3_21`: Alpine Linux 3.21
* `alpine_3_23`: Alpine Linux 3.23
* `alpine_3_24`: Alpine Linux 3.24
* `centos_9`: CentOS Stream 9
* `centos_10`: CentOS Stream 10 (Coughlan)
* `debian_11`: Debian GNU/Linux 11 (bullseye) ([supported until 2026-08-31][debian-lts])
Expand Down Expand Up @@ -116,7 +116,7 @@ Assuming the AWS credentials are available, it can be used like this:

```sh
tofu init
export TF_VAR_os=alpine_3_23
export TF_VAR_os=alpine_3_24
export TF_VAR_k0sctl_skip=true
tofu apply
tofu output -json | jq -r '
Expand Down Expand Up @@ -188,7 +188,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_23"]' \
-f oses='["alpine_3_24"]' \
-f network-providers='["calico"]'
✓ Created workflow_dispatch event for ostests-matrix.yaml at some/experimental/branch

Expand Down
2 changes: 1 addition & 1 deletion hack/ostests/modules/os/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ locals {
os = {
al2023 = local.os_al2023
alpine_3_21 = local.os_alpine_3_21
alpine_3_23 = local.os_alpine_3_23
alpine_3_24 = local.os_alpine_3_24
centos_9 = local.os_centos_9
centos_10 = local.os_centos_10
debian_11 = local.os_debian_11
Expand Down
12 changes: 6 additions & 6 deletions hack/ostests/modules/os/os_alpine_3_23.tf → hack/ostests/modules/os/os_alpine_3_24.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# https://www.alpinelinux.org/cloud/

data "aws_ami" "alpine_3_23" {
count = (var.os == "alpine_3_23" || startswith(var.os, "windows_")) ? 1 : 0
data "aws_ami" "alpine_3_24" {
count = (var.os == "alpine_3_24" || startswith(var.os, "windows_")) ? 1 : 0

owners = ["538276064493"]
name_regex = "^alpine-3\\.23\\.\\d+-(aarch64|x86_64)-uefi-tiny($|-.*)"
name_regex = "^alpine-3\\.24\\.\\d+-(aarch64|x86_64)-uefi-tiny($|-.*)"
most_recent = true

filter {
name = "name"
values = ["alpine-3.23.*-*-uefi-tiny*"]
values = ["alpine-3.24.*-*-uefi-tiny*"]
}

filter {
Expand All @@ -29,10 +29,10 @@ data "aws_ami" "alpine_3_23" {
}

locals {
os_alpine_3_23 = (var.os != "alpine_3_23" && !startswith(var.os, "windows_")) ? {} : {
os_alpine_3_24 = (var.os != "alpine_3_24" && !startswith(var.os, "windows_")) ? {} : {
node_configs = {
default = {
ami_id = one(data.aws_ami.alpine_3_23.*.id)
ami_id = one(data.aws_ami.alpine_3_24.*.id)

user_data = templatefile("${path.module}/os_alpine_userdata.tftpl", { worker = true })
ready_script = file("${path.module}/os_alpine_ready.sh")
Expand Down
4 changes: 2 additions & 2 deletions hack/ostests/modules/os/os_windows_server_2022.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ data "aws_ami" "windows_server_2022" {
locals {
os_windows_server_2022 = var.os != "windows_server_2022" ? {} : {
node_configs = {
default = local.os_alpine_3_23.node_configs.default
controller = local.os_alpine_3_23.node_configs.controller
default = local.os_alpine_3_24.node_configs.default
controller = local.os_alpine_3_24.node_configs.controller

worker = {
ami_id = one(data.aws_ami.windows_server_2022.*.id)
Expand Down
Loading