Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e595fcc28 |
Generated
+14
-26
@@ -2,34 +2,22 @@
|
|||||||
# Manual edits may be lost in future updates.
|
# Manual edits may be lost in future updates.
|
||||||
|
|
||||||
provider "registry.terraform.io/hashicorp/null" {
|
provider "registry.terraform.io/hashicorp/null" {
|
||||||
version = "3.3.1"
|
version = "3.2.1"
|
||||||
constraints = "3.3.1"
|
constraints = "3.2.1"
|
||||||
hashes = [
|
hashes = [
|
||||||
"h1:4pjRixNj9/nijyC0jrCr8tYOpZ8afFwZ2M86y81PMa0=",
|
"h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=",
|
||||||
"h1:6H++HbVhT9h31TNdGvlkW+2rjeWzgdjy98zqWpEJbgk=",
|
"zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840",
|
||||||
"h1:8fi/ACgBQzyw1gloPdzewHbGNeNCX1roaKHRYA1oJIM=",
|
"zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb",
|
||||||
"h1:EVks/Xyl9ffLEDraAp8RSsynzoVbTHOsof5n2niAsa0=",
|
"zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5",
|
||||||
"h1:GYp3g8OhJCT2nc0Nv5s8HPh9nsMydHbjyUh6P4sE+8w=",
|
"zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3",
|
||||||
"h1:KWpBuTftQiLorSdw8QDMivKf6IhvVV0RzrdWSN53Qzs=",
|
|
||||||
"h1:TuxJq10DVnRP7c5HBZPyyvQGcckNVfijyU1eXEu5e4M=",
|
|
||||||
"h1:VMDxsLCSHpRC04bNeQw0JTvm5HhShID64QCSPvi9DRc=",
|
|
||||||
"h1:c7EI8Sso93CiiAmD7P/53OOjAm5A7Q2+Z30aUTUFaEs=",
|
|
||||||
"h1:m5FqidbIgh+E9OigiZh8/xbkvpUQFSj3hZo/jqNLCLQ=",
|
|
||||||
"h1:mV9WSUbshqmqPnhbOg198pgnjJQNnYixjXlovJBbl54=",
|
|
||||||
"h1:oTK+zJCvllZur0nfzBZFGbflcZbvxnESJxepZprFRik=",
|
|
||||||
"zh:08c59776542ea16e5a8545752787b17ff412922182b4cfabe16139197be8ac44",
|
|
||||||
"zh:123109cc7e5ed6d515787fbc212f2a3fd5e75647bb24ab7c801ccd4d4ed42451",
|
|
||||||
"zh:14b3fa4372754b54844b41d5dbd4671a292d8d6828b90169061feb4d7b15dd05",
|
|
||||||
"zh:56a4daaa3212f57b764bf3d1f333141c6610c5f21abb240e0111221f7c7fa4d4",
|
|
||||||
"zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
|
"zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
|
||||||
"zh:7e888a026dbacd2474a42264227ae35f639780f0f0c613529d10a95cd61988b3",
|
"zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238",
|
||||||
"zh:85a53646267e87d600df7124e4767ffde9bba3b6356d45d961618bdd68131cc7",
|
"zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc",
|
||||||
"zh:8ffa0e9c7c39b2ab0905b472465d6e35ef0b776b3f6273bb34c150340b61bff1",
|
"zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970",
|
||||||
"zh:9846510a1841530d4403f4818e233f91e3b3bade7441047599fbf800742f65be",
|
"zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2",
|
||||||
"zh:afa98d44860875f037c6def0a7e6ff208e042712ba771f620482b143cd336891",
|
"zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5",
|
||||||
"zh:bdca130d9ef27488ae0b13bc8fd8019e8bbdd4f2ceff29da066bd333165d68c5",
|
"zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f",
|
||||||
"zh:cb3b94cbca88210dd0d1f11e2b8a89333f48c3857faf8f70f589072ce7c28610",
|
"zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694",
|
||||||
"zh:f0c0ba87925fe32f84b80f7513b1efb1b0866f51f899ba825e95ad59ff09b018",
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
null = {
|
null = {
|
||||||
source = "hashicorp/null"
|
source = "hashicorp/null"
|
||||||
version = "3.3.1"
|
version = "3.2.1"
|
||||||
}
|
}
|
||||||
template = {
|
template = {
|
||||||
source = "hashicorp/template"
|
source = "hashicorp/template"
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
@@ -47,7 +46,7 @@ job "traefik" {
|
|||||||
driver = "docker"
|
driver = "docker"
|
||||||
|
|
||||||
config {
|
config {
|
||||||
image = "traefik:v3.3"
|
image = "traefik:v3.6"
|
||||||
ports = ["http", "https", "api"]
|
ports = ["http", "https", "api"]
|
||||||
|
|
||||||
volumes = [
|
volumes = [
|
||||||
@@ -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/"
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
+4
-4
@@ -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 |
|
||||||
@@ -298,8 +298,8 @@ exit 1
|
|||||||
- [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
|
- [x] **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
|
||||||
|
|||||||
Reference in New Issue
Block a user