1 Commits
Author SHA1 Message Date
renovate 3ddfe7431e Update Terraform libvirt to v0.9.7
CI / Terraform fmt + validate (pull_request) Successful in 20s
CI / Nomad job spec validate (pull_request) Successful in 16s
2026-04-19 05:20:49 +00:00
19 changed files with 58 additions and 132 deletions
-36
View File
@@ -52,39 +52,3 @@ jobs:
echo "==> $f" echo "==> $f"
nomad job validate "$f" nomad job validate "$f"
done done
image-pull:
name: Docker image pull validation
runs-on: ubuntu-latest
# Only run on PRs that touch nomad job specs
if: github.event_name == 'pull_request'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Pull changed images
run: |
git fetch origin ${{ github.base_ref }}
IMAGES=$(git diff origin/${{ github.base_ref }}...HEAD -- '*.nomad.hcl' \
| grep '^+\s*image\s*=' \
| grep -oP '"[^"]+:[^"]+"' \
| tr -d '"' \
| sort -u || true)
if [ -z "$IMAGES" ]; then
echo "No image changes detected, skipping pull."
exit 0
fi
FAILED=0
while IFS= read -r image; do
echo "==> Pulling $image"
if ! docker pull "$image"; then
echo "ERROR: Failed to pull $image"
FAILED=1
fi
done <<< "$IMAGES"
exit $FAILED
-2
View File
@@ -58,10 +58,8 @@ job "pgadmin" {
] ]
check { check {
name = "alive"
type = "http" type = "http"
path = "/" path = "/"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
-4
View File
@@ -7,10 +7,6 @@ job "postgres" {
connect { connect {
sidecar_service {} sidecar_service {}
} }
# Note: TCP checks are not valid for Connect-enabled services (runs through
# Envoy sidecar). Postgres is a single-writer DB that we never canary, so
# observable health via Consul is lower priority than other services.
} }
task "postgres" { task "postgres" {
@@ -33,10 +33,8 @@ job "authelia" {
} }
check { check {
name = "alive"
type = "http" type = "http"
path = "/health" path = "/health"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
+1 -5
View File
@@ -35,8 +35,7 @@ job "traefik" {
check { check {
name = "alive" name = "alive"
type = "http" type = "tcp"
path = "/ping"
port = "api" port = "api"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
@@ -86,9 +85,6 @@ api:
dashboard: true dashboard: true
insecure: true insecure: true
ping:
entryPoint: traefik
providers: providers:
file: file:
directory: "/etc/traefik/configs/" directory: "/etc/traefik/configs/"
+14
View File
@@ -29,6 +29,7 @@ job "act-runner" {
env = { env = {
GITEA_INSTANCE_URL = "https://gitea-1ef0bea6b75a4fd3e9393a9f7f7e4b02.othrayte.one" GITEA_INSTANCE_URL = "https://gitea-1ef0bea6b75a4fd3e9393a9f7f7e4b02.othrayte.one"
CONFIG_FILE = "/secrets/runner-config.yml"
} }
# Required SOPS key: # Required SOPS key:
@@ -42,6 +43,19 @@ EOF
env = true env = true
} }
# Limit which images/labels the runner will accept so it doesn't pick up
# unrelated workloads if more runners are added later.
template {
data = <<EOF
runner:
labels:
- "ubuntu-latest:docker://node:20-bookworm"
- "ubuntu-22.04:docker://node:20-bookworm"
- "ubuntu-24.04:docker://node:20-bookworm"
EOF
destination = "secrets/runner-config.yml"
}
resources { resources {
cpu = 200 cpu = 200
memory = 256 memory = 256
-4
View File
@@ -54,10 +54,8 @@ EOH
] ]
check { check {
name = "alive"
type = "http" type = "http"
path = "/" path = "/"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
@@ -80,10 +78,8 @@ EOH
} }
check { check {
name = "alive"
type = "http" type = "http"
path = "/" path = "/"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
+1 -3
View File
@@ -32,10 +32,8 @@ job "gitea" {
] ]
check { check {
name = "alive"
type = "http" type = "http"
path = "/api/healthz" path = "/"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
+2 -3
View File
@@ -12,7 +12,7 @@ job "glance" {
driver = "docker" driver = "docker"
config { config {
image = "glanceapp/glance:v0.7.8" image = "glanceapp/glance:latest"
ports = ["http"] ports = ["http"]
volumes = [ volumes = [
"local/glance.yml:/app/config/glance.yml", "local/glance.yml:/app/config/glance.yml",
@@ -30,8 +30,7 @@ job "glance" {
check { check {
name = "alive" name = "alive"
type = "http" type = "tcp"
path = "/"
port = "http" port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
+2 -3
View File
@@ -28,11 +28,10 @@ job "jellyfin" {
check { check {
name = "alive" name = "alive"
type = "http" type = "tcp"
path = "/health"
port = "http" port = "http"
interval = "10s" interval = "10s"
timeout = "5s" timeout = "2s"
} }
} }
-2
View File
@@ -33,10 +33,8 @@ job "ntfy" {
] ]
check { check {
name = "alive"
type = "http" type = "http"
path = "/healthz" path = "/healthz"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
-4
View File
@@ -31,10 +31,8 @@ job "openreader" {
] ]
check { check {
name = "alive"
type = "http" type = "http"
path = "/" path = "/"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
@@ -50,10 +48,8 @@ job "openreader" {
} }
check { check {
name = "alive"
type = "http" type = "http"
path = "/" path = "/"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
+2 -4
View File
@@ -34,9 +34,8 @@ job "prowlarr" {
] ]
check { check {
name = "alive"
type = "http" type = "http"
path = "/ping" path = "/"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
@@ -52,9 +51,8 @@ job "prowlarr" {
} }
check { check {
name = "alive"
type = "http" type = "http"
path = "/ping" path = "/"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
+2 -4
View File
@@ -37,9 +37,8 @@ job "sonarr" {
] ]
check { check {
name = "alive"
type = "http" type = "http"
path = "/ping" path = "/"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
@@ -55,9 +54,8 @@ job "sonarr" {
} }
check { check {
name = "alive"
type = "http" type = "http"
path = "/ping" path = "/"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
-2
View File
@@ -16,10 +16,8 @@ job "transfer" {
] ]
check { check {
name = "alive"
type = "http" type = "http"
path = "/" path = "/"
port = "http"
interval = "10s" interval = "10s"
timeout = "2s" timeout = "2s"
} }
-20
View File
@@ -21,26 +21,6 @@ job "unifi-network" {
UNIFI_STDOUT = "true" UNIFI_STDOUT = "true"
} }
# Register in Consul so Traefik and health checks can find it.
# address_mode=driver uses the macvlan IP (192.168.1.50) rather than the host IP.
service {
name = "unifi-network"
port = 8443
address_mode = "driver"
# TCP/HTTP checks from the Consul agent can't reach the macvlan IP (host↔macvlan
# isolation). Use a script check instead — it runs inside the container via
# docker exec and connects to localhost:8443 directly.
check {
name = "alive"
type = "script"
command = "/usr/bin/curl"
args = ["-sk", "--max-time", "5", "-o", "/dev/null", "https://localhost:8443"]
interval = "30s"
timeout = "10s"
}
}
volume_mount { volume_mount {
volume = "unraid_appdata_unifi_network" volume = "unraid_appdata_unifi_network"
destination = "/unifi" # Expected root directory (contains data, log, cert subdirs) destination = "/unifi" # Expected root directory (contains data, log, cert subdirs)
+28 -28
View File
@@ -2,34 +2,34 @@
# Manual edits may be lost in future updates. # Manual edits may be lost in future updates.
provider "registry.terraform.io/dmacvicar/libvirt" { provider "registry.terraform.io/dmacvicar/libvirt" {
version = "0.9.8" version = "0.9.7"
constraints = "0.9.8" constraints = "0.9.7"
hashes = [ hashes = [
"h1:/9TSq9ibeojseTyT6Jx3z/dbvT5uw8ka3/18NKonrQc=", "h1:2UgC5zSaQlQ6YkFCgNqejAi29ILgLdECAZyTEf/5jGc=",
"h1:BN5hy1RaHlpcV0BDJYrSOEklK4YNdZCpiXOOGn0ce9k=", "h1:2v7BBcq3D+4X4z3rEyVG7RsO+6mBowOsdqgDMc7hUdo=",
"h1:MNJ6dcFru4DwQM7maIUAADJIHn3aF+L8XsnRJlleNaM=", "h1:3Ipfiie71ruKDALSpPZecG3+wLleuqDiUmVDx1raOcc=",
"h1:P1Cx0VZGTe6cpWpQ4JFOPJJb+Z+N50t4e1VA76T1tAA=", "h1:Cm89jub5fHuqba/fsNn/wztI9g9F72s2DHV2qGlLdZ0=",
"h1:Pm9du7Rzsg1bhLq+XnW9VaLSjTu0Yytr9AOdP9FLQvM=", "h1:IFXvQT9JqeiXlAbQRQlNHpZ6LHV1ZTYpAOUUajen8Fw=",
"h1:Q/JvNhRskJqDKPJoO9DW3+Ons3mk8kc++zlT4TucyFw=", "h1:KQ6ygrhp6zZobRovn6T57ZCPJcBNStJ0LR+EHY3Dklo=",
"h1:Tzk+wRzhboY3F3wB1u0y3ySMMd4ZPtJbOYlTbbkxZc0=", "h1:PVdYUKN4ZrUzDVWrydJExt4Ry6xboAiXl2+lK7RGz44=",
"h1:Uuk8gkDEzmXfOTW/nm8GMG2aen7n/+X5GsTAf7eVRJc=", "h1:Q5ZOIKPi8iASnC7HFDualeA08S6tg9r4V37WBW0YbUI=",
"h1:cRBlnB/TG4+l0y0i42QLU0JoLDBxxJEwCguLXS9Rv8A=", "h1:SD92jZbvN4HfRzvds0/Y+imu39y0c5NuwtPuIj64zPU=",
"h1:jn+hA9lIJzH5T0550IaKNsHxEAbyTGtvYWm02JCxexM=", "h1:W0pqgeoCVxzdr/2aUMIG+TfLYZSfAYv84IPoUm/UYSk=",
"h1:pKAwAcCGEwsKvVy5eIxdmb1gLhTTxB0xGVi8/jqj0uI=", "h1:aiOjaz5bsvczvEfc78PWZCsPDvQmwVMzIebVAzIuhGc=",
"h1:wS5VlGinhpnMCva0tKwLRPRQxmMUl80L05AueWshzNg=", "h1:osjWHVgSitvr0ycgZQEVMVX9ly33lq5bMiMKAUh4JU0=",
"h1:yqZeKoJ+EZc3687/+ZBqBmtwzvBPLNwaEHW74+bSc6Y=", "h1:vdMblF3sJkstxm2zXE1z/0Hije42plcpynyDmqqjuD4=",
"zh:061e5187853729e1d8ba20938402ad6e778b4097436925d0bef7741c8aa26ee1", "zh:0892a2581f460333a8c140cc53110a1675657200cbd2a49d9f4667bc238d0098",
"zh:69a2ac8ee0cb0c1581bdc9a1296d89abcd1808229ff0a2fa20678ba4f7472944", "zh:17c06d5ca81bda6ff8bdcab401a45b8345bbcb7e6964af5f4aa3099880d9cb8e",
"zh:8b02bf349191b4e7d9529d620da9e9265de5bd01d6983bb079589acdf80dda7a", "zh:2a01ce583bae2fd412a49860ab13e2736255241f5710c5427d6fa274b8a11cf8",
"zh:9620872ed1da1ff421e85dd4ba2a110c284f3f0d06369c36a9aa75d501155fad", "zh:2d333b5e5a8eaf9269d0844c08563a86b7941175c656b17bb36e0bdfaf974bd2",
"zh:9ae7c932b7fb6f62ff20b863a15a7cd713415faa4c789472dc403062808366cb", "zh:3e0bc0f1852fc32bbebd506fef074123a49452cffb737de5795c1c3f8e6a4802",
"zh:a369c3e271b49e085940e6181fe6c1086c2126eebf5c7ad2b1db8fc8792dd30c", "zh:4ca9364bd4f5f7183bb3aca41d0d99b70beb7a9e01b94cc940123882e96b7001",
"zh:a45ad97d7192bea104b32521839dd705a330f13364cf1007dc912b6a0b6be3c8", "zh:a7eb62a7e5ac71ee72abe7a6d183dce88968969eecef710bbe2fb5da0c84ca23",
"zh:b69f2a13ff688ad4b79e14deb6ef6341187864f50960bc0fd9c682f6077b4318", "zh:c5c6f41a7165da93eaffda938c3ed11999a6ffbf635897e38026e622d438e6ad",
"zh:c20b467ff0ac76431a7bdb99662b9414b922ea603327509518c0179416cdfea3", "zh:d3b595c75d2237ab39b690550dd9d6fe21b8a9a716e7ff94348e988575aad5a1",
"zh:c22d45913bd1f00a33d1a4b80547e4a2854409a298a0868c1730124f03a210ad", "zh:d5572d18c21f055f71783b2dbe998895007f4e0d6aab8540f11f6a012f3b32c2",
"zh:cf82bb14884fcbdcd57620cee248994b1633ea246fa49fd668d2f1739abb982d", "zh:e78950fd984805cddad8432f2283451059445baab8014c3b165038ff0887328e",
"zh:ddc1cb4417206dd46eb22c3b81204b3a5edda03c4436e6a5914d541fcfd4c27f", "zh:e8157504e9324892fb9860912cf765b9d333d3f6ca9bc24faf411ce729b3cdd2",
"zh:e6b1983b8f1b9658448d0d09635619cc75dde314e6b4d7fd16d827f9e4bdb767", "zh:f7f7d41de689de068891a608a2b1b4f312cc41171aeea783f193285ca15968ca",
] ]
} }
@@ -2,7 +2,7 @@ terraform {
required_providers { required_providers {
libvirt = { libvirt = {
source = "dmacvicar/libvirt" source = "dmacvicar/libvirt"
version = "0.9.8" version = "0.9.7"
} }
} }
} }
+5 -5
View File
@@ -188,8 +188,8 @@ Most jobs already have Consul health checks — these can use `health_check = "c
| frigate | ✅ | ✅ `single-node-writer` | ⚠️ same — rolling | | frigate | ✅ | ✅ `single-node-writer` | ⚠️ same — rolling |
| glance | ✅ | no | ✅ yes | | glance | ✅ | no | ✅ yes |
| transfer | ✅ | ✅ `single-node-writer` | ⚠️ rolling | | transfer | ✅ | ✅ `single-node-writer` | ⚠️ rolling |
| openreader | `/` | ✅ `single-node-writer` | ⚠️ rolling | | openreader | | ✅ `single-node-writer` | ⚠️ add check first, then rolling |
| unifi | ✅ script | ✅ `single-node-writer` | ⚠️ rolling | | unifi | | ✅ `single-node-writer` | ⚠️ add check first, then rolling |
| traefik | (ingress) | ✅ | ⚠️ rolling — downtime risk, promote quickly | | traefik | (ingress) | ✅ | ⚠️ rolling — downtime risk, promote quickly |
| authelia | (ingress) | ✅ | ✅ stateless config, canary fine | | authelia | (ingress) | ✅ | ✅ stateless config, canary fine |
| renovate | batch job | n/a | n/a — no deployment model | | renovate | batch job | n/a | n/a — no deployment model |
@@ -296,10 +296,10 @@ exit 1
- [x] **Phase 1a**: Create `act-runner.nomad.hcl` + Terraform wrapper, register runner token in Gitea, get a hello-world workflow green - [x] **Phase 1a**: Create `act-runner.nomad.hcl` + Terraform wrapper, register runner token in Gitea, get a hello-world workflow green
- [x] **Phase 1b**: Add `terraform fmt` + `terraform validate -backend=false` workflow — no secrets needed - [x] **Phase 1b**: Add `terraform fmt` + `terraform validate -backend=false` workflow — no secrets needed
- [x] **Phase 1c**: Add Nomad validate step — add `NOMAD_ADDR` + read-only `NOMAD_TOKEN` to Gitea secrets - [x] **Phase 1c**: Add Nomad validate step — add `NOMAD_ADDR` + read-only `NOMAD_TOKEN` to Gitea secrets
- [x] **Phase 2**: Add image pull validation step to the workflow - [ ] **Phase 2**: Add image pull validation step to the workflow
- [ ] **Phase 3a**: Add `update` stanzas to ntfy and glance (simplest, no volume conflict) - [ ] **Phase 3a**: Add `update` stanzas to ntfy and glance (simplest, no volume conflict)
- [ ] **Phase 3b**: Add rolling `update` stanzas to remaining service jobs (jellyfin, sonarr, prowlarr, deluge, gitea, immich, transfer, frigate, openreader, unifi, authelia, traefik) - [ ] **Phase 3b**: Add rolling `update` stanzas to remaining service jobs (jellyfin, sonarr, etc.)
- [x] **Phase 3c**: Add health checks to openreader and unifi before adding update stanzas - [ ] **Phase 3c**: Add health checks to openreader and unifi before adding update stanzas
- [ ] **Phase 4a**: Add on-push workflow that runs `terraform apply -auto-approve` using full credential set - [ ] **Phase 4a**: Add on-push workflow that runs `terraform apply -auto-approve` using full credential set
- [ ] **Phase 4b**: Add deployment promotion/revert polling script - [ ] **Phase 4b**: Add deployment promotion/revert polling script
- [ ] **Phase 4c**: Wire ntfy notifications for promote/revert outcomes - [ ] **Phase 4c**: Wire ntfy notifications for promote/revert outcomes