unkinben
ba7a1a9509
## Why The re-keyed internal `unkin.net` intermediate broke CA consumers (CNPG->RGW backups, subPath/startup-cached CA mounts) and needed manual pod restarts, because Reloader was deployed with `ignoreSecrets: true` and could not restart on the `vault-ca-cert` Secret. Enabling secret watching naively is unsafe: many workloads carry the generic `reloader.stakater.com/auto`, and the estate rotates numerous Secrets via Vault/VSO — those would restart on every rotation. This enables secret watching but scopes existing `auto` to ConfigMaps, making secret-reload opt-in per Secret. ## Changes - Set `reloader.ignoreSecrets: false` (au-syd1 reloader-system values) so Secrets are watched. - Convert every generic `reloader.stakater.com/auto: "true"` to the ConfigMap-only `configmap.reloader.stakater.com/auto: "true"` — 22 annotations across 19 files. Existing ConfigMap-reload behaviour is preserved; Vault/VSO Secret rotations no longer restart these workloads. - Add explicit `secret.reloader.stakater.com/reload: "vault-ca-cert"` to the CA consumers that mount the CA and carry a Reloader annotation: `artifactapi/api`, `cephrgw-operator`, `puppetserver-master`, `puppetserver-compiler`, `litellm`, `logarchiver`. - Add `secret.reloader.stakater.com/reload: "kanidm-tls"` so kanidm rolls when cert-manager renews its leaf. - Add `docs/ca-rotation.md` runbook (indexed in `docs/README.md`). ## Safety review (secret-only / CA workloads) `vault-ca-cert` is a plain reflected Secret that bootstraps Vault trust (not VSO-rotated; changes only on intermediate re-key). `kanidm-tls` is a cert-manager leaf. Everything else mounted (`environment`, `*-credentials`, `eyaml-keys`, `puppetboard-secrets`, `s3-credentials`, `nats-auth`, `clickhouse-credentials`, `woodpecker-*`) is VSO/CNPG Vault-rotated and deliberately excluded. - `cephrgw-operator` — mounts only Secrets (`cephrgw-credentials` VSO + `vault-ca-cert`), no ConfigMap. Its old comment said "restart when the credentials Secret rotates"; `cephrgw-credentials` is VSO so that is now excluded, and reload is scoped to `vault-ca-cert` only. Comment updated. - `nats` (logging) — old comment "Roll the StatefulSet when nats-auth changes"; `nats-auth` is VSO, so this is now ConfigMap-only (deliberately no roll on rotation). Comment updated. Same for the vector agent/aggregator/vm-ingest (VSO `nats-auth`/`clickhouse-credentials`). - `artifactapi/ui` — mounts neither a ConfigMap nor a Secret; its `auto` was already a no-op. Left as ConfigMap-only. - `puppetdb` / `puppetboard` — mount a ConfigMap plus VSO Secrets (postgres creds / puppetboard-secrets); ConfigMap-only is correct, no secret reload added. CA consumers that mount `vault-ca-cert` but have **no** Reloader annotation (CRD-managed or startup-cached) are documented in `docs/ca-rotation.md` for manual restart rather than annotated here: `grafana`, `observability/vmagent`, `paperclip`, `argocd-repo-server`, plus CNPG clusters (`kubectl cnpg restart`). ## Notes / coordination - Annotations left in their existing location (some sit on the pod template, e.g. `litellm`, `puppetdb`; Reloader reads controller-level metadata — placement unchanged from before, no regression). - Touches `apps/overlays/au-syd1/logging/values-vector-*.yaml`, which overlap open PR #320 (Tier-2 Vector pipelines) — only the one-line reloader annotation is changed here. ## Validation - `make kubeconform` — touched overlays (reloader-system, logging, woodpecker, authentik) valid; only the known-unrelated cattle-system rancher chart kubeVersion failure remains. - `uvx pre-commit run --all-files` — all hooks pass. Closes #326 --------- Co-authored-by: Ben Vincent <neotheo@gmail.com> Reviewed-on: #339 Co-authored-by: Ben Vincent <ben@unkin.net> Co-committed-by: Ben Vincent <ben@unkin.net>
105 lines
3.5 KiB
YAML
105 lines
3.5 KiB
YAML
# Dedicated JetStream-enabled NATS cluster for the log bus. Deliberately NOT
|
|
# shared with app messaging (streamstack et al. run their own NATS in their own
|
|
# repo) — a separate cluster isolates logging blast-radius from app messaging
|
|
# and lets us size retention/storage purely for the log outage-buffer + replay
|
|
# use-case.
|
|
fullnameOverride: nats
|
|
|
|
config:
|
|
cluster:
|
|
enabled: true
|
|
replicas: 3
|
|
jetstream:
|
|
enabled: true
|
|
fileStore:
|
|
pvc:
|
|
# Sized for 3d retention: ~100 GiB/3d compressed (see
|
|
# nats-stream-limits ConfigMap) + file-store WAL/index/overhead, kept
|
|
# safely above the 130 GiB max_bytes cap. 3 replicas => ~0.5 TiB total
|
|
# provisioned on cephrbd-fast-delete. NB: this is the honest number for
|
|
# the assumed ~1500 events/s; higher real volume needs a bigger PVC +
|
|
# max_bytes together, else discard=old truncates retention below 3d.
|
|
size: 180Gi
|
|
storageClassName: cephrbd-fast-delete
|
|
# Per-user auth with publish/subscribe separation. Passwords are injected as
|
|
# env vars from the Vault-synced nats-auth Secret. The `<< $VAR >>` wrapping is
|
|
# REQUIRED by this chart: it renders the value UNQUOTED in nats.conf so the
|
|
# NATS server expands the env var. A plain `$VAR` is JSON-quoted ("$VAR") and
|
|
# NATS then treats it as a literal string — which broke auth for every client.
|
|
merge:
|
|
authorization:
|
|
users:
|
|
# Bootstrap Job (stream/consumer management) — full JetStream API.
|
|
- user: log-admin
|
|
password: << $NATS_ADMIN_PASSWORD >>
|
|
# Edge publishers (k8s DaemonSet + VM ingest) — publish only.
|
|
- user: log-producer
|
|
password: << $NATS_PRODUCER_PASSWORD >>
|
|
permissions:
|
|
publish:
|
|
allow:
|
|
- "logs.>"
|
|
subscribe:
|
|
allow:
|
|
- "_INBOX.>"
|
|
# Consumers (transform tier + archiver) — pull + ack only, no publish
|
|
# to log subjects.
|
|
- user: log-consumer
|
|
password: << $NATS_CONSUMER_PASSWORD >>
|
|
permissions:
|
|
publish:
|
|
allow:
|
|
- "$JS.API.CONSUMER.>"
|
|
- "$JS.API.STREAM.INFO.>"
|
|
- "$JS.ACK.LOGS.>"
|
|
subscribe:
|
|
allow:
|
|
- "_INBOX.>"
|
|
|
|
container:
|
|
# Pulled through the artifactapi dockerhub remote (upstream official nats;
|
|
# no DHI variant available for nats).
|
|
image:
|
|
repository: artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/nats
|
|
tag: 2.14.2-alpine
|
|
env:
|
|
NATS_ADMIN_PASSWORD:
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: nats-auth
|
|
key: admin_password
|
|
NATS_PRODUCER_PASSWORD:
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: nats-auth
|
|
key: producer_password
|
|
NATS_CONSUMER_PASSWORD:
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: nats-auth
|
|
key: consumer_password
|
|
resources:
|
|
requests:
|
|
cpu: 250m
|
|
memory: 512Mi
|
|
limits:
|
|
cpu: "2"
|
|
memory: 4Gi
|
|
|
|
# Roll the StatefulSet on config changes only; nats-auth is Vault-rotated (VSO)
|
|
# so it is deliberately not watched here (no restart on routine key rotation).
|
|
podTemplate:
|
|
merge:
|
|
metadata:
|
|
annotations:
|
|
configmap.reloader.stakater.com/auto: "true"
|
|
|
|
# Config-reloader sidecar image, also through artifactapi.
|
|
reloader:
|
|
image:
|
|
repository: artifactapi.k8s.syd1.au.unkin.net/dockerhub/natsio/nats-server-config-reloader
|
|
tag: "0.23.0"
|
|
|
|
natsBox:
|
|
enabled: false
|