## Context Wave 3A (commitc9d221d5) added the `# KYVERNO_LIFECYCLE_V1` marker to the 27 pre-existing `ignore_changes = [...dns_config]` sites so they could be grepped and audited. It did NOT address pod-owning resources that were simply missing the suppression entirely. Post-Wave-3A sampling (2026-04-18) found that navidrome, f1-stream, frigate, servarr, monitoring, crowdsec, and many other stacks showed perpetual `dns_config` drift every plan because their `kubernetes_deployment` / `kubernetes_stateful_set` / `kubernetes_cron_job_v1` resources had no `lifecycle {}` block at all. Root cause (same as Wave 3A): Kyverno's admission webhook stamps `dns_config { option { name = "ndots"; value = "2" } }` on every pod's `spec.template.spec.dns_config` to prevent NxDomain search-domain flooding (see `k8s-ndots-search-domain-nxdomain-flood` skill). Without `ignore_changes` on every Terraform-managed pod-owner, Terraform repeatedly tries to strip the injected field. ## This change Extends the Wave 3A convention by sweeping EVERY `kubernetes_deployment`, `kubernetes_stateful_set`, `kubernetes_daemon_set`, `kubernetes_cron_job_v1`, `kubernetes_job_v1` (+ their `_v1` variants) in the repo and ensuring each carries the right `ignore_changes` path: - **kubernetes_deployment / stateful_set / daemon_set / job_v1**: `spec[0].template[0].spec[0].dns_config` - **kubernetes_cron_job_v1**: `spec[0].job_template[0].spec[0].template[0].spec[0].dns_config` (extra `job_template[0]` nesting — the CronJob's PodTemplateSpec is one level deeper) Each injection / extension is tagged `# KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2` inline so the suppression is discoverable via `rg 'KYVERNO_LIFECYCLE_V1' stacks/`. Two insertion paths are handled by a Python pass (`/tmp/add_dns_config_ignore.py`): 1. **No existing `lifecycle {}`**: inject a brand-new block just before the resource's closing `}`. 108 new blocks on 93 files. 2. **Existing `lifecycle {}` (usually for `DRIFT_WORKAROUND: CI owns image tag` from Wave 4, commit a62b43d1)**: extend its `ignore_changes` list with the dns_config path. Handles both inline (`= [x]`) and multiline (`= [\n x,\n]`) forms; ensures the last pre-existing list item carries a trailing comma so the extended list is valid HCL. 34 extensions. The script skips anything already mentioning `dns_config` inside an `ignore_changes`, so re-running is a no-op. ## Scale - 142 total lifecycle injections/extensions - 93 `.tf` files touched - 108 brand-new `lifecycle {}` blocks + 34 extensions of existing ones - Every Tier 0 and Tier 1 stack with a pod-owning resource is covered - Together with Wave 3A's 27 pre-existing markers → **169 greppable `KYVERNO_LIFECYCLE_V1` dns_config sites across the repo** ## What is NOT in this change - `stacks/trading-bot/main.tf` — entirely commented-out block (`/* … */`). Python script touched the file, reverted manually. - `_template/main.tf.example` skeleton — kept minimal on purpose; any future stack created from it should either inherit the Wave 3A one-line form or add its own on first `kubernetes_deployment`. - `terraform fmt` fixes to pre-existing alignment issues in meshcentral, nvidia/modules/nvidia, vault — unrelated to this commit. Left for a separate fmt-only pass. - Non-pod resources (`kubernetes_service`, `kubernetes_secret`, `kubernetes_manifest`, etc.) — they don't own pods so they don't get Kyverno dns_config mutation. ## Verification Random sample post-commit: ``` $ cd stacks/navidrome && ../../scripts/tg plan → No changes. $ cd stacks/f1-stream && ../../scripts/tg plan → No changes. $ cd stacks/frigate && ../../scripts/tg plan → No changes. $ rg -c 'KYVERNO_LIFECYCLE_V1' stacks/ --include='*.tf' --include='*.tf.example' \ | awk -F: '{s+=$2} END {print s}' 169 ``` ## Reproduce locally 1. `git pull` 2. `rg 'KYVERNO_LIFECYCLE_V1' stacks/ | wc -l` → 169+ 3. `cd stacks/navidrome && ../../scripts/tg plan` → expect 0 drift on the deployment's dns_config field. Refs: code-seq (Wave 3B dns_config class closed; kubernetes_manifest annotation class handled separately in8d94688dfor tls_secret) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
593 lines
15 KiB
HCL
593 lines
15 KiB
HCL
variable "tls_secret_name" {
|
|
type = string
|
|
sensitive = true
|
|
}
|
|
variable "nfs_server" { type = string }
|
|
variable "postgresql_host" { type = string }
|
|
|
|
data "vault_kv_secret_v2" "secrets" {
|
|
mount = "secret"
|
|
name = "rybbit"
|
|
}
|
|
|
|
resource "kubernetes_namespace" "rybbit" {
|
|
metadata {
|
|
name = "rybbit"
|
|
labels = {
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
lifecycle {
|
|
# KYVERNO_LIFECYCLE_V1: goldilocks-vpa-auto-mode ClusterPolicy stamps this label on every namespace
|
|
ignore_changes = [metadata[0].labels["goldilocks.fairwinds.com/vpa-update-mode"]]
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_manifest" "external_secret" {
|
|
manifest = {
|
|
apiVersion = "external-secrets.io/v1beta1"
|
|
kind = "ExternalSecret"
|
|
metadata = {
|
|
name = "rybbit-secrets"
|
|
namespace = "rybbit"
|
|
}
|
|
spec = {
|
|
refreshInterval = "15m"
|
|
secretStoreRef = {
|
|
name = "vault-kv"
|
|
kind = "ClusterSecretStore"
|
|
}
|
|
target = {
|
|
name = "rybbit-secrets"
|
|
}
|
|
dataFrom = [{
|
|
extract = {
|
|
key = "rybbit"
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
depends_on = [kubernetes_namespace.rybbit]
|
|
}
|
|
|
|
module "tls_secret" {
|
|
source = "../../modules/kubernetes/setup_tls_secret"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|
|
|
|
resource "random_string" "random" {
|
|
length = 32
|
|
lower = true
|
|
}
|
|
|
|
locals {
|
|
clickhouse_db = "clickhouse"
|
|
}
|
|
|
|
|
|
resource "kubernetes_persistent_volume_claim" "clickhouse_data_proxmox" {
|
|
wait_until_bound = false
|
|
metadata {
|
|
name = "rybbit-clickhouse-data-proxmox"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
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"
|
|
resources {
|
|
requests = {
|
|
storage = "1Gi"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_config_map" "clickhouse_memory" {
|
|
metadata {
|
|
name = "clickhouse-memory-config"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
}
|
|
data = {
|
|
"memory.xml" = <<-EOF
|
|
<clickhouse>
|
|
<max_server_memory_usage>1258291200</max_server_memory_usage>
|
|
<!-- Disable high-churn system logs to reduce disk writes -->
|
|
<trace_log remove="1"/>
|
|
<text_log remove="1"/>
|
|
<metric_log remove="1"/>
|
|
<asynchronous_metric_log remove="1"/>
|
|
<query_log remove="1"/>
|
|
<part_log remove="1"/>
|
|
<processors_profile_log remove="1"/>
|
|
<query_metric_log remove="1"/>
|
|
<error_log remove="1"/>
|
|
<latency_log remove="1"/>
|
|
</clickhouse>
|
|
EOF
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_deployment" "clickhouse" {
|
|
metadata {
|
|
name = "clickhouse"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
labels = {
|
|
app = "clickhouse"
|
|
tier = local.tiers.aux
|
|
}
|
|
annotations = {
|
|
"reloader.stakater.com/auto" = "true"
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "Recreate"
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "clickhouse"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "clickhouse"
|
|
}
|
|
}
|
|
spec {
|
|
security_context {
|
|
run_as_user = 101
|
|
run_as_group = 101
|
|
fs_group = 101
|
|
}
|
|
container {
|
|
name = "clickhouse"
|
|
image = "clickhouse/clickhouse-server:25.4.2"
|
|
env {
|
|
name = "CLICKHOUSE_DB"
|
|
value = local.clickhouse_db
|
|
}
|
|
env {
|
|
name = "CLICKHOUSE_PASSWORD"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "rybbit-secrets"
|
|
key = "clickhouse_password"
|
|
}
|
|
}
|
|
}
|
|
port {
|
|
name = "clickhouse"
|
|
protocol = "TCP"
|
|
container_port = 8123
|
|
}
|
|
liveness_probe {
|
|
http_get {
|
|
path = "/ping"
|
|
port = 8123
|
|
}
|
|
initial_delay_seconds = 15
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 5
|
|
}
|
|
readiness_probe {
|
|
http_get {
|
|
path = "/ping"
|
|
port = 8123
|
|
}
|
|
initial_delay_seconds = 5
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 3
|
|
}
|
|
volume_mount {
|
|
name = "data"
|
|
mount_path = "/var/lib/clickhouse"
|
|
}
|
|
volume_mount {
|
|
name = "memory-config"
|
|
mount_path = "/etc/clickhouse-server/config.d/memory.xml"
|
|
sub_path = "memory.xml"
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "500m"
|
|
memory = "1Gi"
|
|
}
|
|
limits = {
|
|
memory = "1536Mi"
|
|
}
|
|
}
|
|
}
|
|
volume {
|
|
name = "data"
|
|
persistent_volume_claim {
|
|
claim_name = kubernetes_persistent_volume_claim.clickhouse_data_proxmox.metadata[0].name
|
|
}
|
|
}
|
|
volume {
|
|
name = "memory-config"
|
|
config_map {
|
|
name = kubernetes_config_map.clickhouse_memory.metadata[0].name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
lifecycle {
|
|
# KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
|
ignore_changes = [spec[0].template[0].spec[0].dns_config]
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "clickhouse" {
|
|
metadata {
|
|
name = "clickhouse"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
labels = {
|
|
"app" = "clickhouse"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
app = "clickhouse"
|
|
}
|
|
port {
|
|
name = "http"
|
|
target_port = 8123
|
|
port = 8123
|
|
protocol = "TCP"
|
|
}
|
|
}
|
|
}
|
|
|
|
# CronJob to truncate ClickHouse system log tables every 6 hours.
|
|
# These tables grow unboundedly on NFS and trigger CPU-heavy background merges.
|
|
resource "kubernetes_cron_job_v1" "clickhouse_truncate_logs" {
|
|
metadata {
|
|
name = "clickhouse-truncate-logs"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
}
|
|
spec {
|
|
schedule = "0 */6 * * *"
|
|
successful_jobs_history_limit = 1
|
|
failed_jobs_history_limit = 1
|
|
job_template {
|
|
metadata {}
|
|
spec {
|
|
template {
|
|
metadata {}
|
|
spec {
|
|
restart_policy = "OnFailure"
|
|
container {
|
|
name = "truncate"
|
|
image = "curlimages/curl:8.12.1"
|
|
command = [
|
|
"sh", "-c",
|
|
join(" && ", [
|
|
"curl -s 'http://clickhouse.rybbit.svc.cluster.local:8123/?user=default&password=${data.vault_kv_secret_v2.secrets.data["clickhouse_password"]}' -d 'TRUNCATE TABLE IF EXISTS system.metric_log'",
|
|
"curl -s 'http://clickhouse.rybbit.svc.cluster.local:8123/?user=default&password=${data.vault_kv_secret_v2.secrets.data["clickhouse_password"]}' -d 'TRUNCATE TABLE IF EXISTS system.trace_log'",
|
|
"curl -s 'http://clickhouse.rybbit.svc.cluster.local:8123/?user=default&password=${data.vault_kv_secret_v2.secrets.data["clickhouse_password"]}' -d 'TRUNCATE TABLE IF EXISTS system.text_log'",
|
|
"curl -s 'http://clickhouse.rybbit.svc.cluster.local:8123/?user=default&password=${data.vault_kv_secret_v2.secrets.data["clickhouse_password"]}' -d 'TRUNCATE TABLE IF EXISTS system.asynchronous_metric_log'",
|
|
"curl -s 'http://clickhouse.rybbit.svc.cluster.local:8123/?user=default&password=${data.vault_kv_secret_v2.secrets.data["clickhouse_password"]}' -d 'TRUNCATE TABLE IF EXISTS system.query_log'",
|
|
"curl -s 'http://clickhouse.rybbit.svc.cluster.local:8123/?user=default&password=${data.vault_kv_secret_v2.secrets.data["clickhouse_password"]}' -d 'TRUNCATE TABLE IF EXISTS system.part_log'",
|
|
"echo 'System logs truncated'"
|
|
])
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
lifecycle {
|
|
# KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
|
ignore_changes = [spec[0].job_template[0].spec[0].template[0].spec[0].dns_config]
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_deployment" "rybbit" {
|
|
metadata {
|
|
name = "rybbit"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
labels = {
|
|
app = "rybbit"
|
|
tier = local.tiers.aux
|
|
}
|
|
annotations = {
|
|
"reloader.stakater.com/auto" = "true"
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
selector {
|
|
match_labels = {
|
|
app = "rybbit"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "rybbit"
|
|
}
|
|
annotations = {
|
|
"diun.enable" = "true"
|
|
"diun.include_tags" = "^v?\\d+\\.\\d+\\.\\d+$"
|
|
"dependency.kyverno.io/wait-for" = "postgresql.dbaas:5432,clickhouse.rybbit:8123"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
image = "ghcr.io/rybbit-io/rybbit-backend:v1.1.0"
|
|
name = "rybbit"
|
|
|
|
env {
|
|
name = "NODE_ENV"
|
|
value = "production"
|
|
}
|
|
env {
|
|
name = "CLICKHOUSE_HOST"
|
|
value = "http://clickhouse.rybbit.svc.cluster.local:8123"
|
|
}
|
|
env {
|
|
name = "CLICKHOUSE_DB"
|
|
value = local.clickhouse_db
|
|
}
|
|
env {
|
|
name = "CLICKHOUSE_USER"
|
|
value = "default"
|
|
}
|
|
env {
|
|
name = "CLICKHOUSE_PASSWORD"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "rybbit-secrets"
|
|
key = "clickhouse_password"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "POSTGRES_HOST"
|
|
value = var.postgresql_host
|
|
}
|
|
env {
|
|
name = "POSTGRES_PORT"
|
|
value = "5432"
|
|
}
|
|
env {
|
|
name = "POSTGRES_DB"
|
|
value = "rybbit"
|
|
}
|
|
env {
|
|
name = "POSTGRES_USER"
|
|
value = "rybbit"
|
|
}
|
|
env {
|
|
name = "POSTGRES_PASSWORD"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "rybbit-secrets"
|
|
key = "postgres_password"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "BASE_URL"
|
|
value = "https://rybbit.viktorbarzin.me"
|
|
}
|
|
env {
|
|
name = "DISABLE_SIGNUP"
|
|
value = "true"
|
|
}
|
|
env {
|
|
name = "BETTER_AUTH_SECRET"
|
|
value = random_string.random.result
|
|
}
|
|
env {
|
|
name = "AUTH_ENABLED"
|
|
value = "true"
|
|
}
|
|
port {
|
|
container_port = 3001
|
|
}
|
|
liveness_probe {
|
|
http_get {
|
|
path = "/api/health"
|
|
port = 3001
|
|
}
|
|
initial_delay_seconds = 15
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 5
|
|
}
|
|
readiness_probe {
|
|
http_get {
|
|
path = "/api/health"
|
|
port = 3001
|
|
}
|
|
initial_delay_seconds = 5
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 3
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "25m"
|
|
memory = "384Mi"
|
|
}
|
|
limits = {
|
|
memory = "384Mi"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
lifecycle {
|
|
# KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
|
ignore_changes = [spec[0].template[0].spec[0].dns_config]
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "rybbit" {
|
|
metadata {
|
|
name = "rybbit"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
labels = {
|
|
"app" = "rybbit"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
"app" = "rybbit"
|
|
}
|
|
port {
|
|
name = "http"
|
|
port = 80
|
|
target_port = 3001
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_deployment" "rybbit-client" {
|
|
metadata {
|
|
name = "rybbit-client"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
labels = {
|
|
app = "rybbit-client"
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
selector {
|
|
match_labels = {
|
|
app = "rybbit-client"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "rybbit-client"
|
|
}
|
|
annotations = {
|
|
"dependency.kyverno.io/wait-for" = "rybbit.rybbit:80"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
name = "rybbit-client"
|
|
image = "ghcr.io/rybbit-io/rybbit-client:v1.1.0"
|
|
env {
|
|
name = "NODE_ENV"
|
|
value = "production"
|
|
}
|
|
env {
|
|
name = "DISABLE_SIGNUP"
|
|
value = "true"
|
|
}
|
|
port {
|
|
name = "rybbit-client"
|
|
protocol = "TCP"
|
|
container_port = 3002
|
|
}
|
|
liveness_probe {
|
|
http_get {
|
|
path = "/"
|
|
port = 3002
|
|
}
|
|
initial_delay_seconds = 15
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 5
|
|
}
|
|
readiness_probe {
|
|
http_get {
|
|
path = "/"
|
|
port = 3002
|
|
}
|
|
initial_delay_seconds = 5
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 3
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "10m"
|
|
memory = "192Mi"
|
|
}
|
|
limits = {
|
|
memory = "192Mi"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
lifecycle {
|
|
# KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
|
ignore_changes = [spec[0].template[0].spec[0].dns_config]
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "rybbit-client" {
|
|
metadata {
|
|
name = "rybbit-client"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
labels = {
|
|
"app" = "rybbit-client"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
"app" = "rybbit-client"
|
|
}
|
|
port {
|
|
name = "http"
|
|
port = 80
|
|
target_port = 3002
|
|
}
|
|
}
|
|
}
|
|
|
|
module "ingress" {
|
|
source = "../../modules/kubernetes/ingress_factory"
|
|
dns_type = "proxied"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
name = "rybbit"
|
|
service_name = "rybbit-client"
|
|
tls_secret_name = var.tls_secret_name
|
|
extra_annotations = {
|
|
"gethomepage.dev/enabled" = "true"
|
|
"gethomepage.dev/name" = "Rybbit"
|
|
"gethomepage.dev/description" = "Web analytics"
|
|
"gethomepage.dev/icon" = "rybbit.png"
|
|
"gethomepage.dev/group" = "Finance & Personal"
|
|
"gethomepage.dev/pod-selector" = ""
|
|
}
|
|
}
|
|
|
|
module "ingress-api" {
|
|
source = "../../modules/kubernetes/ingress_factory"
|
|
dns_type = "proxied"
|
|
namespace = kubernetes_namespace.rybbit.metadata[0].name
|
|
name = "rybbit-api"
|
|
host = "rybbit"
|
|
service_name = "rybbit"
|
|
ingress_path = ["/api"]
|
|
tls_secret_name = var.tls_secret_name
|
|
extra_annotations = {
|
|
"gethomepage.dev/enabled" = "false"
|
|
}
|
|
}
|