Skip to content

templates: Add almalinux-10 #3602

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
merged 1 commit into from
Jun 5, 2025
Merged

templates: Add almalinux-10 #3602

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
4 changes: 2 additions & 2 deletions hack/update-template-almalinux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function almalinux_url_spec_from_location() {
jq_filter='capture(
"^https://repo\\.almalinux\\.org/almalinux/(?<path_version>\\d+(\\.\\d+)?)/cloud/(?<path_arch>[^/]+)/images/" +
"AlmaLinux-(?<major_version>\\d+)-(?<target_vendor>.*)-" +
"(latest|(?<major_minor_version>\\d+\\.\\d+)-(?<date>\\d{8}))\\.(?<arch>[^.]+).(?<file_extension>.*)$"
"(latest|(?<major_minor_version>\\d+\\.\\d+)-(?<date>\\d{8})(?:\\.\\d+)?)\\.(?<arch>[^.]+).(?<file_extension>.*)$"
;"x")
'
url_spec=$(jq -e -r "${jq_filter}" <<<"\"${location}\"")
Expand Down Expand Up @@ -112,7 +112,7 @@ function almalinux_latest_image_entry_for_url_spec() {
capture(
"^AlmaLinux-\($spec.major_version)-\($spec.target_vendor)-" +
"(?<major_minor_version>\($spec.major_version)\\.\\d+)-" +
"(?<date>\\d{8})\\.\($spec.arch)\\.\($spec.file_extension)$"
"(?<date>\\d{8}(?:\\.\\d)?)\\.\($spec.arch)\\.\($spec.file_extension)$"
;"x"
) |
.version_number_array = ([.major_minor_version | scan("\\d+") | tonumber])
Expand Down
3 changes: 2 additions & 1 deletion templates/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ Default: [`default`](./default.yaml) (⭐Ubuntu, with containerd/nerdctl)

Distro:
- [`almalinux-8`](./almalinux-8.yaml): AlmaLinux 8
- [`almalinux-9`](./almalinux-9.yaml), `almalinux.yaml`: AlmaLinux 9
- [`almalinux-9`](./almalinux-9.yaml): AlmaLinux 9
- [`almalinux-10`](./almalinux-10.yaml), `almalinux.yaml`: AlmaLinux 10
- [`almalinux-kitten-10`](./almalinux-kitten-10.yaml), `almalinux-kitten.yaml`: AlmaLinux Kitten 10
- [`alpine`](./alpine.yaml): ☆Alpine Linux
- [`alpine-iso`](./alpine-iso.yaml): ☆Alpine Linux (ISO9660 image). Compatible with the `alpine` template used in Lima prior to v1.0.
Expand Down
23 changes: 23 additions & 0 deletions templates/_images/almalinux-10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
images:
- location: "https://repo.almalinux.org/almalinux/10.0/cloud/x86_64/images/AlmaLinux-10-GenericCloud-10.0-20250528.0.x86_64.qcow2"
arch: "x86_64"
digest: "sha256:9c528c5895c7fb5fc906add749d48057dbba4a4258a708c224aa3ef60fda14bd"
- location: "https://repo.almalinux.org/almalinux/10.0/cloud/aarch64/images/AlmaLinux-10-GenericCloud-10.0-20250528.0.aarch64.qcow2"
arch: "aarch64"
digest: "sha256:34f255fab5d82f5470b173016cf7265282f09fc36a0c50fde72c9a7166c450ea"
- location: "https://repo.almalinux.org/almalinux/10.0/cloud/s390x/images/AlmaLinux-10-GenericCloud-10.0-20250528.0.s390x.qcow2"
arch: "s390x"
digest: "sha256:a867b0ee9b9e537aa2d599430ee9be0808fc66f723dbf5937b204bfeb449b207"
# Fallback to the latest release image.
# Hint: run `limactl prune` to invalidate the cache

- location: https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2
arch: x86_64

- location: https://repo.almalinux.org/almalinux/10/cloud/aarch64/images/AlmaLinux-10-GenericCloud-latest.aarch64.qcow2
arch: aarch64

- location: https://repo.almalinux.org/almalinux/10/cloud/s390x/images/AlmaLinux-10-GenericCloud-latest.s390x.qcow2
arch: s390x

mountTypesUnsupported: [9p]
5 changes: 5 additions & 0 deletions templates/almalinux-10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
minimumLimaVersion: 1.1.0

base:
- template://_images/almalinux-10
- template://_default/mounts
2 changes: 1 addition & 1 deletion templates/almalinux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
almalinux-9.yaml
almalinux-10.yaml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably we should bump up almalinux, rockylinux, oraclelinux, and centos-stream to 10 at once

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't mind reverting this part if needed for merge, but I don't think that's really a useful policy. All of those have somewhat different release cycles, especially CentOS Stream where 10 has been the "current" version for quite a while now, and Rocky and OL aren't even out with version 10 yet. Additionally, in practice people tend to choose one or two of them across infra, so there's no real utility to be gained from matching up all the versions.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with this. I think the unversioned template should point to the latest "stable" version. There is no reason for us to link the release schedules of different distros.

I think it would be good to write down a policy for when the unversioned templates get updated. E.g. what is the reason centos-stream.yaml still links to version 9?

Maybe we need to come up with a somewhat arbitrary definition of what "stable" means for each distro that doesn't define it itself? Even if it is something like "3 months after its initial release".

But given that Alma has Alma Kitten as upstream, I don't know why you would need to wait any longer once the project decides the current snapshot is "stable".

Loading