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>
68 lines
2.1 KiB
YAML
68 lines
2.1 KiB
YAML
agent:
|
|
replicaCount: 3
|
|
env:
|
|
WOODPECKER_MAX_WORKFLOWS: "8"
|
|
WOODPECKER_BACKEND_K8S_PRIORITY_CLASS: power
|
|
WOODPECKER_BACKEND_K8S_STORAGE_CLASS: cephrbd-fast-delete
|
|
WOODPECKER_BACKEND_K8S_VOLUME_SIZE: 10G
|
|
WOODPECKER_BACKEND_K8S_STORAGE_RWX: false
|
|
# Required from woodpecker 3.16.0 (GHSA-qf34-295c-26v8): step-level
|
|
# serviceAccountName is gated behind this agent flag (default false).
|
|
# The estate's pipelines set backend_options.kubernetes.serviceAccountName
|
|
# (terraform-* jobs rely on per-SA Vault k8s auth), so keep this enabled.
|
|
WOODPECKER_BACKEND_K8S_SERVICE_ACCOUNT_NAME_ALLOW_FROM_STEP: "true"
|
|
WOODPECKER_LOG_LEVEL: debug
|
|
#extraSecretNamesForEnvFrom:
|
|
# - woodpecker-default-agent-secret
|
|
persistence:
|
|
storageClass: cephrbd-fast-delete
|
|
podAnnotations:
|
|
configmap.reloader.stakater.com/auto: "true"
|
|
resources:
|
|
requests:
|
|
cpu: 50m
|
|
limits:
|
|
memory: 128Mi
|
|
|
|
server:
|
|
statefulSet:
|
|
replicaCount: 1
|
|
env:
|
|
WOODPECKER_HOST: 'https://ci.k8s.syd1.au.unkin.net'
|
|
WOODPECKER_OPEN: "true"
|
|
WOODPECKER_ADMIN: "unkinben"
|
|
WOODPECKER_DISABLE_USER_AGENT_REGISTRATION: "true"
|
|
WOODPECKER_PLUGINS_PRIVILEGED: "woodpeckerci/plugin-docker-buildx,woodpeckerci/plugin-docker-buildx:latest-insecure"
|
|
extraSecretNamesForEnvFrom:
|
|
- woodpecker-gitea
|
|
- woodpecker-postgres-credentials
|
|
- woodpecker-database-config
|
|
persistentVolume:
|
|
storageClass: cephrbd-fast-delete
|
|
podAnnotations:
|
|
configmap.reloader.stakater.com/auto: "true"
|
|
ingress:
|
|
enabled: true
|
|
annotations:
|
|
cert-manager.io/cluster-issuer: vault-issuer
|
|
cert-manager.io/common-name: ci.k8s.syd1.au.unkin.net
|
|
cert-manager.io/private-key-size: "4096"
|
|
external-dns.alpha.kubernetes.io/hostname: ci.k8s.syd1.au.unkin.net
|
|
external-dns.alpha.kubernetes.io/target: 198.18.200.0
|
|
ingressClassName: nginx
|
|
hosts:
|
|
- host: ci.k8s.syd1.au.unkin.net
|
|
paths:
|
|
- path: /
|
|
backend:
|
|
servicePort: 80
|
|
tls:
|
|
- hosts:
|
|
- ci.k8s.syd1.au.unkin.net
|
|
secretName: ci-tls
|
|
resources:
|
|
requests:
|
|
cpu: 100m
|
|
limits:
|
|
memory: 128Mi
|