feat: upgrade to almalinux 9.7

2026-01-12 22:01:21 +11:00
75 changed files with 46 additions and 403 deletions
@@ -81,7 +81,6 @@ $(DIRS):
 	# Build the image
 	@(cd $(IMAGES_PATH)/$@ && \
 	export DATE=$(DATE_TAG) && \
-	export VERSION=$$(cat version) && \
 	export OS_NAME=$$(echo $@ | cut -d'/' -f1) && \
 	export OS_VERSION_FULL=$$(echo $@ | cut -d'/' -f2) && \
 	export OS_IMAGE=$$(echo $@ | cut -d'/' -f3) && \
@@ -64,7 +64,7 @@ build {
  post-processors {
    post-processor "docker-tag" {
      repository = "${var.docker_server}/unkin/${var.os_name}${var.os_version_major}-${var.os_image}"
-      tags = ["latest", var.git_commit, var.version]
+      tags = ["latest", var.date]
    }

    dynamic "post-processor" {
@@ -1 +1 @@
-20260117
+20260106
@@ -1 +1,2 @@
 docker
+incus
@@ -1,6 +1,6 @@
 [appstream]
 name=appstream repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/AppStream/x86_64/os
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/AppStream/x86_64/os/RPM-GPG-KEY-AlmaLinux-8
+baseurl=https://edgecache.query.consul/almalinux/8.10/AppStream/x86_64/os
+gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
 enabled=1
 gpgcheck=1
@@ -1,6 +1,6 @@
 [baseos]
 name=baseos repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/BaseOS/x86_64/os
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux-8
+baseurl=https://edgecache.query.consul/almalinux/8.10/BaseOS/x86_64/os
+gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
 enabled=1
 gpgcheck=1
@@ -1,6 +1,6 @@
 [epel]
 name=epel repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/8/Everything/x86_64
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/RPM-GPG-KEY-EPEL-8
+baseurl=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/
+gpgkey=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/RPM-GPG-KEY-EPEL-8
 enabled=1
 gpgcheck=1
@@ -0,0 +1,4 @@
+[extras]
+name=extras repository
+baseurl=https://edgecache.query.consul/almalinux/8.10/extras/x86_64/os
+gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
@@ -1,6 +1,4 @@
-[ha]
-name=ha repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/HighAvailability/x86_64/os
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/HighAvailability/x86_64/os/RPM-GPG-KEY-AlmaLinux-8
-enabled=1
-gpgcheck=1
+[highavailability]
+name=highavailability repository
+baseurl=https://edgecache.query.consul/almalinux/8.10/HighAvailability/x86_64/os
+gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
@@ -1,7 +1,7 @@
 # replaced by crb repo in EL9
 [powertools]
 name=powertools repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/PowerTools/x86_64/os
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/PowerTools/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://edgecache.query.consul/almalinux/8.10/PowerTools/x86_64/os
+gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
 enabled=1
 gpgcheck=1
@@ -1,6 +1,6 @@
 [unkin]
 name=unkin repository
-baseurl=https://git.unkin.net/api/packages/unkin/rpm/almalinux/el8
-gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key
+baseurl=https://git.query.consul/api/packages/unkin/rpm/almalinux/el8
+gpgkey=https://git.query.consul/api/packages/unkin/rpm/repository.key
 enabled=1
 gpgcheck=0
@@ -1,7 +1,7 @@
 # only available on EL8
 [unkinben]
 name=unkinben repository
-baseurl=https://git.unkin.net/api/packages/unkinben/rpm/el8
-gpgkey=https://git.unkin.net/api/packages/unkinben/rpm/repository.key
+baseurl=https://git.query.consul/api/packages/unkinben/rpm/el8
+gpgkey=https://git.query.consul/api/packages/unkinben/rpm/repository.key
 enabled=1
 gpgcheck=0
@@ -15,7 +15,7 @@ packages = [
 ]
 scripts_pre_file_copy = [
  "rm -f /etc/yum.repos.d/*.repo",
-  "curl -k -o internal-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/internal-ca-certificates/20240825-1.el8/files/756 && rpm -i internal-ca-certificates.rpm"
+  "curl -k -o internal-ca-certificates.rpm https://git.query.consul/unkin/-/packages/rpm/internal-ca-certificates/20240825-1.el8/files/756 && rpm -i internal-ca-certificates.rpm"
 ]
 scripts_pre_packages = [
  "dnf makecache",
@@ -1 +1 @@
-20260516
+20260106
@@ -1 +1 @@
-20260117
+20250608
@@ -6,7 +6,6 @@ packages = [
  "automake",
  "binutils",
  "bison",
-  "buildah",
  "byacc",
  "cmake",
  "diffstat",
@@ -1 +1 @@
-20260117
+20260106
@@ -1 +1 @@
-20260606
+20260112
@@ -1 +1 @@
-2.1.2
+20260112
@@ -1 +1,2 @@
 docker
+incus
@@ -1,6 +1,6 @@
 [appstream]
 name=appstream repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/AppStream/x86_64/os
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/AppStream/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/AppStream/x86_64/os
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/AppStream/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -1,6 +1,6 @@
 [baseos]
 name=baseos repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/BaseOS/x86_64/os
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/BaseOS/x86_64/os
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -1,7 +1,7 @@
 # new repo for EL9+, replaces PowerTools repo
 [crb]
 name=crb repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/CRB/x86_64/os
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/CRB/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/CRB/x86_64/os
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/CRB/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -1,6 +1,6 @@
 [ha]
 name=ha repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/HighAvailability/x86_64/os
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/HighAvailability/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/HighAvailability/x86_64/os
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/HighAvailability/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -1,6 +1,6 @@
 [unkin]
 name=unkin repository
-baseurl=https://git.unkin.net/api/packages/unkin/rpm/almalinux/el9
-gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key
+baseurl=https://git.query.consul/api/packages/unkin/rpm/almalinux/el9
+gpgkey=https://git.query.consul/api/packages/unkin/rpm/repository.key
 enabled=1
 gpgcheck=0
@@ -16,7 +16,7 @@ packages = [
 ]
 scripts_pre_file_copy = [
  "rm -f /etc/yum.repos.d/*.repo",
-  "curl -k -o internal-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/internal-ca-certificates/20240825-1.el8/files/756 && rpm -i internal-ca-certificates.rpm"
+  "curl -k -o internal-ca-certificates.rpm https://git.query.consul/unkin/-/packages/rpm/internal-ca-certificates/20240825-1.el8/files/756 && rpm -i internal-ca-certificates.rpm"
 ]
 scripts_pre_packages = [
  "dnf makecache",
@@ -1 +1 @@
-20260606
+20260112
@@ -1 +0,0 @@
-docker
@@ -1,12 +0,0 @@
-# almalinux/9.7/makerun
-docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
-packages = [
-  "g10k"
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
-docker_changes = [
-  "CMD /usr/bin/g10k -config /etc/puppetlabs/r10k.yaml"
-]
@@ -1 +0,0 @@
-20260606
@@ -1 +0,0 @@
-docker
@@ -1,10 +0,0 @@
-# almalinux/9.7/gobuilder
-docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
-packages = [
-  "go",
-  "nfpm"
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260606
@@ -1 +1 @@
-20260606
+20260112
@@ -1 +0,0 @@
-docker
@@ -1,11 +0,0 @@
-# almalinux/9.7/makerun
-docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
-packages = [
-  "kubeconform",
-  "kustomize",
-  "helm-4.0.5-1"
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260606
@@ -1 +1 @@
-20260606
+20260112
@@ -1 +0,0 @@
-docker
@@ -1,11 +0,0 @@
-# almalinux/9.7/makerun
-docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
-packages = [
-  "opentofu",
-  "tflint",
-  "terragrunt"
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260606
@@ -1 +0,0 @@
-docker
@@ -1,20 +0,0 @@
-# almalinux/9.7/puppet-validator
-docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
-packages = [
-  "rubygems",
-  "ruby-devel",
-  "gcc",
-  "make",
-  "redhat-rpm-config",
-  "glibc-headers",
-  "glibc-devel",
-  "libffi",
-  "libffi-devel"
-]
-scripts_pre_packages = [
-  "dnf -y group install \"Development Tools\""
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260317
@@ -6,7 +6,6 @@ packages = [
  "automake",
  "binutils",
  "bison",
-  "buildah",
  "byacc",
  "cmake",
  "diffstat",
@@ -1 +1 @@
-20260606
+20260112
@@ -1 +0,0 @@
-docker
@@ -1,6 +0,0 @@
-[updates]
-name=Fedora 42 - x86_64 - Updates
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/updates/42/Everything/x86_64
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-42-primary
-enabled=1
-gpgcheck=1
@@ -1,6 +0,0 @@
-[fedora]
-name=Fedora 42 - x86_64
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/releases/42/Everything/x86_64/os
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-42-primary
-enabled=1
-gpgcheck=1
@@ -1,6 +0,0 @@
-[gitea-unkin-fedora-42]
-name=Unkin Fedora 42
-baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/42
-enabled=1
-gpgcheck=1
-gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key
@@ -1,24 +0,0 @@
-# fedora/42/base
-docker_source = "artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/fedora:42"
-deploy_files_from_image = true
-deploy_files_from_common = false
-scripts_pre_file_copy = [
-  "rm -f /etc/yum.repos.d/*.repo",
-  "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc42/files/15674 && rpm -i unkin-ca-certificates.rpm",
-]
-packages = [
-  "git",
-  "jq",
-  "make",
-  "python3",
-  "python3-pip",
-  "wget",
-]
-scripts_pre_packages = [
-  "dnf makecache",
-  "dnf update -y",
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260521
@@ -1 +0,0 @@
-docker
@@ -1,47 +0,0 @@
-# fedora/42/rpmbuilder
-docker_source = "git.unkin.net/unkin/fedora42-base:latest"
-packages = [
-  "asciidoc",
-  "autoconf",
-  "automake",
-  "binutils",
-  "bison",
-  "buildah",
-  "byacc",
-  "cmake",
-  "diffstat",
-  "flex",
-  "gcc",
-  "gcc-c++",
-  "gdb",
-  "glibc-devel",
-  "go",
-  "gzip",
-  "intltool",
-  "jna",
-  "ltrace",
-  "nfpm",
-  "patchutils",
-  "perl-Fedora-VSP",
-  "perl-generators",
-  "pesign",
-  "pkgconf",
-  "pkgconf-m4",
-  "pkgconf-pkg-config",
-  "redhat-rpm-config",
-  "rpm",
-  "rpm-build",
-  "rpm-sign",
-  "rpmdevtools",
-  "rpmlint",
-  "source-highlight",
-  "strace",
-  "systemtap",
-  "tar",
-  "valgrind",
-  "valgrind-devel",
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260521
@@ -1 +0,0 @@
-docker
@@ -1,6 +0,0 @@
-[updates]
-name=Fedora 43 - x86_64 - Updates
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/updates/43/Everything/x86_64
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-primary
-enabled=1
-gpgcheck=1
@@ -1,6 +0,0 @@
-[fedora]
-name=Fedora 43 - x86_64
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/releases/43/Everything/x86_64/os
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-primary
-enabled=1
-gpgcheck=1
@@ -1,6 +0,0 @@
-[gitea-unkin-fedora-43]
-name=Unkin Fedora 43
-baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/43
-enabled=1
-gpgcheck=1
-gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key
@@ -1,24 +0,0 @@
-# fedora/43/base
-docker_source = "artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/fedora:43"
-deploy_files_from_image = true
-deploy_files_from_common = false
-scripts_pre_file_copy = [
-  "rm -f /etc/yum.repos.d/*.repo",
-   "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc43/files/15602 && rpm -i unkin-ca-certificates.rpm",
-]
-packages = [
-  "git",
-  "jq",
-  "make",
-  "python3",
-  "python3-pip",
-  "wget",
-]
-scripts_pre_packages = [
-  "dnf makecache",
-  "dnf update -y",
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260521
@@ -1 +0,0 @@
-docker
@@ -1,47 +0,0 @@
-# fedora/43/rpmbuilder
-docker_source = "git.unkin.net/unkin/fedora43-base:latest"
-packages = [
-  "asciidoc",
-  "autoconf",
-  "automake",
-  "binutils",
-  "bison",
-  "buildah",
-  "byacc",
-  "cmake",
-  "diffstat",
-  "flex",
-  "gcc",
-  "gcc-c++",
-  "gdb",
-  "glibc-devel",
-  "go",
-  "gzip",
-  "intltool",
-  "jna",
-  "ltrace",
-  "nfpm",
-  "patchutils",
-  "perl-Fedora-VSP",
-  "perl-generators",
-  "pesign",
-  "pkgconf",
-  "pkgconf-m4",
-  "pkgconf-pkg-config",
-  "redhat-rpm-config",
-  "rpm",
-  "rpm-build",
-  "rpm-sign",
-  "rpmdevtools",
-  "rpmlint",
-  "source-highlight",
-  "strace",
-  "systemtap",
-  "tar",
-  "valgrind",
-  "valgrind-devel",
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260521
@@ -1 +0,0 @@
-docker
@@ -1,6 +0,0 @@
-[updates]
-name=Fedora 44 - x86_64 - Updates
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/updates/44/Everything/x86_64
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-primary
-enabled=1
-gpgcheck=1
@@ -1,6 +0,0 @@
-[fedora]
-name=Fedora 44 - x86_64
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/releases/44/Everything/x86_64/os
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-primary
-enabled=1
-gpgcheck=1
@@ -1,6 +0,0 @@
-[gitea-unkin-fedora-44]
-name=Unkin Fedora 44
-baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/44
-enabled=1
-gpgcheck=1
-gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key
@@ -1,24 +0,0 @@
-# fedora/44/base
-docker_source = "artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/fedora:44"
-deploy_files_from_image = true
-deploy_files_from_common = false
-scripts_pre_file_copy = [
-  "rm -f /etc/yum.repos.d/*.repo",
-  "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc44/files/15656 && rpm -i unkin-ca-certificates.rpm",
-]
-packages = [
-  "git",
-  "jq",
-  "make",
-  "python3",
-  "python3-pip",
-  "wget",
-]
-scripts_pre_packages = [
-  "dnf makecache",
-  "dnf update -y",
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260514
@@ -1 +0,0 @@
-docker
@@ -1,47 +0,0 @@
-# fedora/44/rpmbuilder
-docker_source = "git.unkin.net/unkin/fedora44-base:latest"
-packages = [
-  "asciidoc",
-  "autoconf",
-  "automake",
-  "binutils",
-  "bison",
-  "buildah",
-  "byacc",
-  "cmake",
-  "diffstat",
-  "flex",
-  "gcc",
-  "gcc-c++",
-  "gdb",
-  "glibc-devel",
-  "go",
-  "gzip",
-  "intltool",
-  "jna",
-  "ltrace",
-  "nfpm",
-  "patchutils",
-  "perl-Fedora-VSP",
-  "perl-generators",
-  "pesign",
-  "pkgconf",
-  "pkgconf-m4",
-  "pkgconf-pkg-config",
-  "redhat-rpm-config",
-  "rpm",
-  "rpm-build",
-  "rpm-sign",
-  "rpmdevtools",
-  "rpmlint",
-  "source-highlight",
-  "strace",
-  "systemtap",
-  "tar",
-  "valgrind",
-  "valgrind-devel",
-]
-scripts_final = [
-  "dnf clean all",
-  "rm -rf /var/cache/dnf"
-]
@@ -1 +0,0 @@
-20260521
@@ -7,5 +7,5 @@ source "docker" "os" {
 source "incus" "os" {
  image = var.incus_source
  output_image = local.incus_output_image
-  profile = ["build"]
+  profile = "build"
 }
@@ -121,11 +121,6 @@ variable "git_branch" {
  type = string
  default = env("GIT_BRANCH")
 }
-variable "version" {
-  description = "The version from version file."
-  type = string
-  default = env("VERSION")
-}
 variable "include_incus_client_certs" {
  type    = bool
  default = false