## Context Wave 3B-continued: the Goldilocks VPA dashboard (stacks/vpa) runs a Kyverno ClusterPolicy `goldilocks-vpa-auto-mode` that mutates every namespace with `metadata.labels["goldilocks.fairwinds.com/vpa-update-mode"] = "off"`. This is intentional — Terraform owns container resource limits, and Goldilocks should only provide recommendations, never auto-update. The label is how Goldilocks decides per-namespace whether to run its VPA in `off` mode. Effect on Terraform: every `kubernetes_namespace` resource shows the label as pending-removal (`-> null`) on every `scripts/tg plan`. Dawarich survey 2026-04-18 confirmed the drift. Cluster-side count: 88 namespaces carry the label (`kubectl get ns -o json | jq ... | wc -l`). Every TF-managed namespace is affected. This commit brings the intentional admission drift under the same `# KYVERNO_LIFECYCLE_V1` discoverability marker introduced inc9d221d5for the ndots dns_config pattern. The marker now stands generically for any Kyverno admission-webhook drift suppression; the inline comment records which specific policy stamps which specific field so future grep audits show why each suppression exists. ## This change 107 `.tf` files touched — every stack's `resource "kubernetes_namespace"` resource gets: ```hcl 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"]] } ``` Injection was done with a brace-depth-tracking Python pass (`/tmp/add_goldilocks_ignore.py`): match `^resource "kubernetes_namespace" ` → track `{` / `}` until the outermost closing brace → insert the lifecycle block before the closing brace. The script is idempotent (skips any file that already mentions `goldilocks.fairwinds.com/vpa-update-mode`) so re-running is safe. Vault stack picked up 2 namespaces in the same file (k8s-users produces one, plus a second explicit ns) — confirmed via file diff (+8 lines). ## What is NOT in this change - `stacks/trading-bot/main.tf` — entire file is `/* … */` commented out (paused 2026-04-06 per user decision). Reverted after the script ran. - `stacks/_template/main.tf.example` — per-stack skeleton, intentionally minimal. User keeps it that way. Not touched by the script (file has no real `resource "kubernetes_namespace"` — only a placeholder comment). - `.terraform/` copies (e.g. `stacks/metallb/.terraform/modules/...`) — gitignored, won't commit; the live path was edited. - `terraform fmt` cleanup of adjacent pre-existing alignment issues in authentik, freedify, hermes-agent, nvidia, vault, meshcentral. Reverted to keep the commit scoped to the Goldilocks sweep. Those files will need a separate fmt-only commit or will be cleaned up on next real apply to that stack. ## Verification Dawarich (one of the hundred-plus touched stacks) showed the pattern before and after: ``` $ cd stacks/dawarich && ../../scripts/tg plan Before: Plan: 0 to add, 2 to change, 0 to destroy. # kubernetes_namespace.dawarich will be updated in-place (goldilocks.fairwinds.com/vpa-update-mode -> null) # module.tls_secret.kubernetes_secret.tls_secret will be updated in-place (Kyverno generate.* labels — fixed in8d94688d) After: No changes. Your infrastructure matches the configuration. ``` Injection count check: ``` $ rg -c 'KYVERNO_LIFECYCLE_V1: goldilocks-vpa-auto-mode' stacks/ | awk -F: '{s+=$2} END {print s}' 108 ``` ## Reproduce locally 1. `git pull` 2. Pick any stack: `cd stacks/<name> && ../../scripts/tg plan` 3. Expect: no drift on the namespace's goldilocks.fairwinds.com/vpa-update-mode label. Closes: code-dwx Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
577 lines
15 KiB
HCL
577 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
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
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'"
|
|
])
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
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"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
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"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
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"
|
|
}
|
|
}
|