## Context
Two operational gaps surfaced during a healthcheck sweep today:
1. **External monitoring coverage**: Only ~13 hostnames (via `cloudflare_proxied_names`
in `config.tfvars`) had `[External]` monitors in Uptime Kuma. Any service deployed via
`ingress_factory` with `dns_type = "proxied"` auto-created its DNS record but was NOT
registered for external probing — so outages like Immich going down externally were
invisible until a user complained. 99 of ~125 public ingresses had no external
monitor.
2. **actualbudget stack unplannable**: `count = var.budget_encryption_password != null
? 1 : 0` in `factory/main.tf:152` failed with "Invalid count argument" because the
value flows from a `data.kubernetes_secret` whose contents are `(known after apply)`
at plan time. Blocked CI applies and drift reconciliation.
## This change
### Per-ingress external-monitor annotation (ingress_factory + reverse_proxy/factory)
- New variables `external_monitor` (bool, nullable) + `external_monitor_name` (string,
nullable). Default is "follow dns_type" — enabled for any public DNS record
(`dns_type != "none"`, covers both proxied and non-proxied so Immich and other
direct-A records are also monitored).
- Emits two annotations on the Ingress:
- `uptime.viktorbarzin.me/external-monitor = "true"`
- `uptime.viktorbarzin.me/external-monitor-name = "<label>"` (optional override)
### external-monitor-sync CronJob (uptime-kuma stack)
- Discovers targets from live Ingress objects via the K8s API first (filter by
annotation), falls back to the legacy `external-monitor-targets` ConfigMap on any
API error (zero rollout risk).
- New `ServiceAccount` + cluster-wide `ClusterRole`/`ClusterRoleBinding` giving
`list`/`get` on `networking.k8s.io/ingresses`.
- `API_SERVER` now uses the `KUBERNETES_SERVICE_HOST` env var (always injected by K8s)
instead of `kubernetes.default.svc` — the search-domain expansion failed in the
CronJob pod's DNS config. Verified working: CronJob now logs
`Loaded N external monitor targets (source=k8s-api)`.
### actualbudget count-on-unknown refactor
- Replaced `count = var.budget_encryption_password != null ? 1 : 0` with two explicit
plan-time booleans: `enable_http_api` and `enable_bank_sync`. Values are known at
plan; no `-target` workaround needed.
- Callers (`stacks/actualbudget/main.tf`) pass `true` explicitly. Runtime behaviour is
unchanged — the secret is still consumed via env var.
- Also aligned the factory with live state (the 3 budget-* PVCs had been migrated
`proxmox-lvm` → `proxmox-lvm-encrypted` outside Terraform): PVC resource renamed
`data_proxmox` → `data_encrypted`, storage class updated, orphaned `nfs_data` module
removed. State was rm'd + re-imported with matching UIDs, so no data was moved.
## Rollout status (already partially applied in this session)
- `stacks/uptime-kuma` applied — SA + RBAC + CronJob changes live; FQDN fix verified
- `stacks/actualbudget` applied — budget-{viktor,anca,emo} all 200 OK externally
- `stacks/mailserver` + 21 other ingress_factory consumers applied — annotations live
- CronJob `external-monitor-sync` latest run: `source=k8s-api`, 26 monitors active
(was 13 on the central list)
## Deferred (separate work)
- 4 stacks show pre-existing DESTRUCTIVE drift in plan (metallb namespace, claude-memory,
rbac, redis) — NOT triggered by this commit but will be by CI's global-file cascade.
`[ci skip]` here so those don't auto-apply; they will be fixed manually before the
next CI push.
- Cleanup of `cloudflare_proxied_names` list once Helm-managed ingresses (authentik,
grafana, vault, forgejo) are annotated — separate PR.
## Test plan
### Automated
\`\`\`
\$ kubectl -n uptime-kuma logs \$(kubectl -n uptime-kuma get pods -l job-name -o name | tail -1)
Loaded 26 external monitor targets (source=k8s-api)
Sync complete: 7 created, 0 deleted, 17 unchanged
\$ curl -sk -o /dev/null -w "%{http_code}\n" -H "Accept: text/html" \\
https://dawarich.viktorbarzin.me/ https://nextcloud.viktorbarzin.me/ \\
https://budget-viktor.viktorbarzin.me/
200 302 200
\$ kubectl -n actualbudget get deploy,pvc -l app=budget-viktor
deployment.apps/budget-viktor 1/1 1 1 Ready
persistentvolumeclaim/budget-viktor-data-encrypted Bound 10Gi RWO proxmox-lvm-encrypted
\`\`\`
### Manual Verification
1. Confirm the annotation is present on an ingress_factory ingress:
\`\`\`
kubectl -n dawarich get ingress dawarich -o \\
jsonpath='{.metadata.annotations.uptime\.viktorbarzin\.me/external-monitor}'
# Expected: "true"
\`\`\`
2. Confirm the new `[External] <name>` monitor appears in Uptime Kuma within 10 min
(CronJob interval). For Immich specifically, it will appear after the immich stack
is re-applied.
3. Verify actualbudget plan is clean:
\`\`\`
cd stacks/actualbudget && scripts/tg plan --non-interactive
# Expected: no "Invalid count argument" errors
\`\`\`
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
308 lines
8 KiB
HCL
308 lines
8 KiB
HCL
variable "tls_secret_name" {}
|
|
variable "name" {}
|
|
variable "tag" {
|
|
default = "latest"
|
|
}
|
|
variable "tier" { type = string }
|
|
variable "sync_id" {
|
|
type = string
|
|
default = null # If not passed, we won't run banksync
|
|
}
|
|
variable "budget_encryption_password" {
|
|
type = string
|
|
default = null # If not passed, we won't run banksync ;known after initial installation
|
|
sensitive = true
|
|
}
|
|
# Plan-time toggles — these MUST be known at plan time. The secret values
|
|
# (budget_encryption_password, sync_id) are read from ESO-managed K8s Secrets
|
|
# and are unknown at plan time on first apply, so we cannot base `count` on
|
|
# them directly. Callers pass these booleans as hardcoded plan-time constants
|
|
# that reflect whether the corresponding credentials are expected to exist.
|
|
variable "enable_http_api" {
|
|
type = bool
|
|
default = false
|
|
description = "Deploy the actual-http-api sidecar. Must be true for the cronjob to run."
|
|
}
|
|
variable "enable_bank_sync" {
|
|
type = bool
|
|
default = false
|
|
description = "Deploy the daily bank-sync CronJob. Requires enable_http_api=true."
|
|
}
|
|
variable "nfs_server" { type = string }
|
|
variable "homepage_annotations" {
|
|
type = map(string)
|
|
default = {}
|
|
}
|
|
|
|
resource "kubernetes_persistent_volume_claim" "data_encrypted" {
|
|
wait_until_bound = false
|
|
metadata {
|
|
name = "actualbudget-${var.name}-data-encrypted"
|
|
namespace = "actualbudget"
|
|
annotations = {
|
|
"resize.topolvm.io/threshold" = "80%"
|
|
"resize.topolvm.io/increase" = "100%"
|
|
"resize.topolvm.io/storage_limit" = "5Gi"
|
|
}
|
|
}
|
|
spec {
|
|
access_modes = ["ReadWriteOnce"]
|
|
storage_class_name = "proxmox-lvm-encrypted"
|
|
resources {
|
|
requests = {
|
|
storage = "1Gi"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_deployment" "actualbudget" {
|
|
metadata {
|
|
name = "actualbudget-${var.name}"
|
|
namespace = "actualbudget"
|
|
labels = {
|
|
app = "actualbudget-${var.name}"
|
|
tier = var.tier
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "Recreate"
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "actualbudget-${var.name}"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
annotations = {
|
|
"diun.enable" = "false" # daily updates; pretty noisy
|
|
"diun.include_tags" = "^${var.tag}$"
|
|
}
|
|
labels = {
|
|
app = "actualbudget-${var.name}"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
image = "actualbudget/actual-server:${var.tag}"
|
|
name = "actualbudget"
|
|
|
|
port {
|
|
container_port = 5006
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "15m"
|
|
memory = "320Mi"
|
|
}
|
|
limits = {
|
|
memory = "400Mi"
|
|
}
|
|
}
|
|
volume_mount {
|
|
name = "data"
|
|
mount_path = "/data"
|
|
}
|
|
}
|
|
volume {
|
|
name = "data"
|
|
persistent_volume_claim {
|
|
claim_name = kubernetes_persistent_volume_claim.data_encrypted.metadata[0].name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "actualbudget" {
|
|
metadata {
|
|
name = "budget-${var.name}"
|
|
namespace = "actualbudget"
|
|
labels = {
|
|
app = "actualbudget-${var.name}"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
app = "actualbudget-${var.name}"
|
|
}
|
|
port {
|
|
name = "http"
|
|
port = 80
|
|
target_port = 5006
|
|
}
|
|
}
|
|
}
|
|
|
|
module "ingress" {
|
|
source = "../../../modules/kubernetes/ingress_factory"
|
|
namespace = "actualbudget"
|
|
name = "budget-${var.name}"
|
|
tls_secret_name = var.tls_secret_name
|
|
dns_type = "proxied"
|
|
rybbit_site_id = "3e6b6b68088a"
|
|
extra_annotations = var.homepage_annotations
|
|
}
|
|
|
|
|
|
resource "random_string" "api-key" {
|
|
length = 32
|
|
lower = true
|
|
}
|
|
|
|
resource "kubernetes_deployment" "actualbudget-http-api" {
|
|
count = var.enable_http_api ? 1 : 0
|
|
metadata {
|
|
name = "actualbudget-http-api-${var.name}"
|
|
namespace = "actualbudget"
|
|
labels = {
|
|
app = "actualbudget-http-api-${var.name}"
|
|
tier = var.tier
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "RollingUpdate"
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "actualbudget-http-api-${var.name}"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "actualbudget-http-api-${var.name}"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
image = "jhonderson/actual-http-api:latest"
|
|
name = "actualbudget"
|
|
resources {
|
|
requests = {
|
|
cpu = "50m"
|
|
memory = "768Mi"
|
|
}
|
|
limits = {
|
|
memory = "768Mi"
|
|
}
|
|
}
|
|
|
|
port {
|
|
container_port = 5007
|
|
}
|
|
env {
|
|
name = "ACTUAL_SERVER_URL"
|
|
value = "http://budget-${var.name}.actualbudget.svc.cluster.local"
|
|
}
|
|
env {
|
|
name = "ACTUAL_SERVER_PASSWORD"
|
|
value = var.budget_encryption_password
|
|
}
|
|
env {
|
|
name = "API_KEY"
|
|
value = random_string.api-key.result
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "actualbudget-http-api" {
|
|
metadata {
|
|
name = "budget-http-api-${var.name}"
|
|
namespace = "actualbudget"
|
|
labels = {
|
|
app = "actualbudget-http-api-${var.name}"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
app = "actualbudget-http-api-${var.name}"
|
|
}
|
|
port {
|
|
name = "http"
|
|
port = 80
|
|
target_port = 5007
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_cron_job_v1" "bank-sync" {
|
|
count = var.enable_bank_sync ? 1 : 0
|
|
metadata {
|
|
name = "bank-sync-${var.name}"
|
|
namespace = "actualbudget"
|
|
}
|
|
spec {
|
|
concurrency_policy = "Replace"
|
|
failed_jobs_history_limit = 5
|
|
schedule = "0 0 * * *" # Daily
|
|
starting_deadline_seconds = 60
|
|
successful_jobs_history_limit = 10
|
|
job_template {
|
|
metadata {}
|
|
spec {
|
|
backoff_limit = 1
|
|
ttl_seconds_after_finished = 300
|
|
template {
|
|
metadata {}
|
|
spec {
|
|
container {
|
|
name = "bank-sync"
|
|
image = "curlimages/curl"
|
|
command = ["/bin/sh", "-c", <<-EOT
|
|
PUSHGATEWAY="http://prometheus-prometheus-pushgateway.monitoring:9091/metrics/job/bank-sync-${var.name}"
|
|
START=$(date +%s)
|
|
|
|
HTTP_CODE=$(curl -s -o /tmp/response.txt -w '%%{http_code}' \
|
|
-X POST --location \
|
|
'http://budget-http-api-${var.name}/v1/budgets/${var.sync_id}/accounts/banksync' \
|
|
--header 'accept: application/json' \
|
|
--header 'budget-encryption-password: ${var.budget_encryption_password}' \
|
|
--header 'x-api-key: ${random_string.api-key.result}')
|
|
|
|
END=$(date +%s)
|
|
DURATION=$((END - START))
|
|
|
|
if [ "$HTTP_CODE" = "200" ]; then
|
|
SUCCESS=1
|
|
LAST_SUCCESS=$END
|
|
else
|
|
SUCCESS=0
|
|
LAST_SUCCESS=0
|
|
echo "Bank sync failed with HTTP $HTTP_CODE:"
|
|
cat /tmp/response.txt
|
|
echo ""
|
|
fi
|
|
|
|
cat <<METRICS | curl -s --data-binary @- "$PUSHGATEWAY"
|
|
# HELP bank_sync_success Whether the last bank sync succeeded (1=ok, 0=fail)
|
|
# TYPE bank_sync_success gauge
|
|
bank_sync_success $SUCCESS
|
|
# HELP bank_sync_duration_seconds Duration of the last bank sync run
|
|
# TYPE bank_sync_duration_seconds gauge
|
|
bank_sync_duration_seconds $DURATION
|
|
# HELP bank_sync_last_success_timestamp Unix timestamp of the last successful sync
|
|
# TYPE bank_sync_last_success_timestamp gauge
|
|
bank_sync_last_success_timestamp $LAST_SUCCESS
|
|
METRICS
|
|
EOT
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|