From efa048c75f257480d6fea97fe1425671c5d1c4ea Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 8 Mar 2026 22:54:28 +1100
Subject: [PATCH] feat: multi-purpose images

- bump base almalinux 9.7 image
- add opentofu image for testing terraform/terragrunt repos
- add g10k image for puppet on kubernetes
- add kubetest image for testing argocd ci
---
 images/almalinux/9.7/base/version                    |  2 +-
 images/almalinux/9.7/g10k/builds                     |  1 +
 images/almalinux/9.7/g10k/variables.auto.pkrvars.hcl | 12 ++++++++++++
 images/almalinux/9.7/g10k/version                    |  1 +
 images/almalinux/9.7/kubetest/builds                 |  1 +
 .../9.7/kubetest/variables.auto.pkrvars.hcl          | 11 +++++++++++
 images/almalinux/9.7/kubetest/version                |  1 +
 images/almalinux/9.7/opentofu/builds                 |  1 +
 .../9.7/opentofu/variables.auto.pkrvars.hcl          | 11 +++++++++++
 images/almalinux/9.7/opentofu/version                |  1 +
 images/almalinux/9.7/rpmbuilder/version              |  2 +-
 11 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 images/almalinux/9.7/g10k/builds
 create mode 100644 images/almalinux/9.7/g10k/variables.auto.pkrvars.hcl
 create mode 100644 images/almalinux/9.7/g10k/version
 create mode 100644 images/almalinux/9.7/kubetest/builds
 create mode 100644 images/almalinux/9.7/kubetest/variables.auto.pkrvars.hcl
 create mode 100644 images/almalinux/9.7/kubetest/version
 create mode 100644 images/almalinux/9.7/opentofu/builds
 create mode 100644 images/almalinux/9.7/opentofu/variables.auto.pkrvars.hcl
 create mode 100644 images/almalinux/9.7/opentofu/version

diff --git a/images/almalinux/9.7/base/version b/images/almalinux/9.7/base/version
index 13672a9..be1b8db 100644
--- a/images/almalinux/9.7/base/version
+++ b/images/almalinux/9.7/base/version
@@ -1 +1 @@
-20260112
+20260308
diff --git a/images/almalinux/9.7/g10k/builds b/images/almalinux/9.7/g10k/builds
new file mode 100644
index 0000000..bdb9670
--- /dev/null
+++ b/images/almalinux/9.7/g10k/builds
@@ -0,0 +1 @@
+docker
diff --git a/images/almalinux/9.7/g10k/variables.auto.pkrvars.hcl b/images/almalinux/9.7/g10k/variables.auto.pkrvars.hcl
new file mode 100644
index 0000000..52aa6e0
--- /dev/null
+++ b/images/almalinux/9.7/g10k/variables.auto.pkrvars.hcl
@@ -0,0 +1,12 @@
+# 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"
+]
diff --git a/images/almalinux/9.7/g10k/version b/images/almalinux/9.7/g10k/version
new file mode 100644
index 0000000..be1b8db
--- /dev/null
+++ b/images/almalinux/9.7/g10k/version
@@ -0,0 +1 @@
+20260308
diff --git a/images/almalinux/9.7/kubetest/builds b/images/almalinux/9.7/kubetest/builds
new file mode 100644
index 0000000..bdb9670
--- /dev/null
+++ b/images/almalinux/9.7/kubetest/builds
@@ -0,0 +1 @@
+docker
diff --git a/images/almalinux/9.7/kubetest/variables.auto.pkrvars.hcl b/images/almalinux/9.7/kubetest/variables.auto.pkrvars.hcl
new file mode 100644
index 0000000..ce6cf23
--- /dev/null
+++ b/images/almalinux/9.7/kubetest/variables.auto.pkrvars.hcl
@@ -0,0 +1,11 @@
+# almalinux/9.7/makerun
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "kubeconform",
+  "kustomize",
+  "helm"
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
diff --git a/images/almalinux/9.7/kubetest/version b/images/almalinux/9.7/kubetest/version
new file mode 100644
index 0000000..be1b8db
--- /dev/null
+++ b/images/almalinux/9.7/kubetest/version
@@ -0,0 +1 @@
+20260308
diff --git a/images/almalinux/9.7/opentofu/builds b/images/almalinux/9.7/opentofu/builds
new file mode 100644
index 0000000..bdb9670
--- /dev/null
+++ b/images/almalinux/9.7/opentofu/builds
@@ -0,0 +1 @@
+docker
diff --git a/images/almalinux/9.7/opentofu/variables.auto.pkrvars.hcl b/images/almalinux/9.7/opentofu/variables.auto.pkrvars.hcl
new file mode 100644
index 0000000..b444ab4
--- /dev/null
+++ b/images/almalinux/9.7/opentofu/variables.auto.pkrvars.hcl
@@ -0,0 +1,11 @@
+# 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"
+]
diff --git a/images/almalinux/9.7/opentofu/version b/images/almalinux/9.7/opentofu/version
new file mode 100644
index 0000000..be1b8db
--- /dev/null
+++ b/images/almalinux/9.7/opentofu/version
@@ -0,0 +1 @@
+20260308
diff --git a/images/almalinux/9.7/rpmbuilder/version b/images/almalinux/9.7/rpmbuilder/version
index 13672a9..be1b8db 100644
--- a/images/almalinux/9.7/rpmbuilder/version
+++ b/images/almalinux/9.7/rpmbuilder/version
@@ -1 +1 @@
-20260112
+20260308