chore: bump artifactapi

- unkin/artifactapi#3
2026-01-10 17:04:09 +11:00
72 changed files with 75 additions and 151 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,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
+baseurl=https://edgecache.query.consul/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
+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
+baseurl=https://edgecache.query.consul/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
+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
+baseurl=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/
-gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/RPM-GPG-KEY-EPEL-8
+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]
+[highavailability]
-name=ha repository
+name=highavailability repository
-baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/HighAvailability/x86_64/os
+baseurl=https://edgecache.query.consul/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
+gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
 enabled=1
 gpgcheck=1
@@ -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
+baseurl=https://edgecache.query.consul/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
+gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
 enabled=1
 gpgcheck=1
@@ -1 +1 @@
-20260117
+20260106
@@ -1 +1 @@
-20260117
+20250608
@@ -1 +1 @@
-20260117
+20260106
@@ -1,4 +1,4 @@
-# almalinux/9.7/actionsdind
+# almalinux/9.6/actionsdind
 deploy_files_from_common = true
 include_incus_client_certs = true
 docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
@@ -0,0 +1 @@
 20260106
@@ -1,4 +1,4 @@
-# almalinux/9.7/artifactapi
+# almalinux/9.6/rpmbuilder
 docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
 packages = [
  "sudo"
@@ -0,0 +1 @@
 20260110
@@ -0,0 +1,6 @@
 [appstream]
 name=appstream repository
 baseurl=https://packagerepo.service.consul/almalinux/9.6/appstream-daily/x86_64/os/
 gpgkey=https://packagerepo.service.consul/almalinux/9.6/appstream-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -0,0 +1,6 @@
 [baseos]
 name=baseos repository
 baseurl=https://packagerepo.service.consul/almalinux/9.6/baseos-daily/x86_64/os/
 gpgkey=https://packagerepo.service.consul/almalinux/9.6/baseos-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -0,0 +1,7 @@
 # new repo for EL9+, replaces PowerTools repo
 [crb]
 name=crb repository
 baseurl=https://packagerepo.service.consul/almalinux/9.6/crb-daily/x86_64/os/
 gpgkey=https://packagerepo.service.consul/almalinux/9.6/crb-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -0,0 +1,6 @@
 [epel]
 name=epel repository
 baseurl=https://packagerepo.service.consul/epel/9/everything-daily/x86_64/os/
 gpgkey=https://packagerepo.service.consul/epel/9/everything-daily/x86_64/os/RPM-GPG-KEY-EPEL-9
 enabled=1
 gpgcheck=1
@@ -0,0 +1,6 @@
 [extras]
 name=extras repository
 baseurl=https://packagerepo.service.consul/almalinux/9.6/extras-daily/x86_64/os/
 gpgkey=https://packagerepo.service.consul/almalinux/9.6/extras-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -0,0 +1,4 @@
 [ha]
 name=ha repository
 baseurl=https://packagerepo.service.consul/almalinux/9.6/ha-daily/x86_64/os/
 gpgkey=https://packagerepo.service.consul/almalinux/9.6/ha-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
@@ -1,4 +1,4 @@
-# almalinux/9.7/base
+# almalinux/9.6/base
 deploy_files_from_image = true
 deploy_files_from_common = true
 use_incus = true
@@ -0,0 +1 @@
 20260106
@@ -1,4 +1,4 @@
-# almalinux/9.7/jupyterlab
+# almalinux/9.5/jupyterlab
 deploy_files_from_common = true
 docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
 scripts_pre_file_copy = [
@@ -0,0 +1 @@
 20250608
@@ -1,4 +1,4 @@
-# almalinux/9.7/makerun
+# almalinux/9.6/makerun
 docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
 packages = [
  "sudo"
@@ -0,0 +1 @@
 20260110_2
@@ -0,0 +1,4 @@
 [puppet]
 name=puppet repository
 baseurl=https://packagerepo.service.consul/puppet7/el/9-daily/x86_64/os/
 gpgkey=https://packagerepo.service.consul/puppet7/el/9-daily/x86_64/os/RPM-GPG-KEY-puppet-20250406
@@ -1,4 +1,4 @@
-# almalinux/9.7/puppet-base
+# almalinux/9.5/puppet-base
 incus_source = "almalinux9/base/latest"
 deploy_files_from_image = true
 use_incus = true
@@ -0,0 +1 @@
 20250712
@@ -1,4 +1,4 @@
-# almalinux/9.7/rpmbuilder
+# almalinux/9.6/rpmbuilder
 docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
 packages = [
  "asciidoc",
@@ -0,0 +1 @@
 20260106
@@ -1 +0,0 @@
 20260112
@@ -1 +0,0 @@
 2.1.1
@@ -1,6 +0,0 @@
 [appstream]
 name=appstream repository
 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 +0,0 @@
 [baseos]
 name=baseos repository
 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 +0,0 @@
 # new repo for EL9+, replaces PowerTools repo
 [crb]
 name=crb repository
 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 +0,0 @@
 [epel]
 name=epel repository
 baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/9/Everything/x86_64
 gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/RPM-GPG-KEY-EPEL-9
 enabled=1
 gpgcheck=1
@@ -1,6 +0,0 @@
 [ha]
 name=ha repository
 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 +0,0 @@
 20260325
@@ -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 @@
 20260308
@@ -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 @@
 20260325
@@ -1 +0,0 @@
 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 @@
 20260319
@@ -1 +0,0 @@
 docker
@@ -1 +0,0 @@
 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 @@
 20260308
@@ -1,6 +0,0 @@
 [puppet]
 name=puppet repository
 baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/openvox/openvox7/el/9/x86_64
 gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/openvox/GPG-KEY-openvox.pub
 enabled=1
 gpgcheck=1
@@ -1 +0,0 @@
 20260112
@@ -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
@@ -1 +0,0 @@
 docker
@@ -1 +0,0 @@
 20260308
@@ -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