2026-03-17 18:11:53 +00:00
|
|
|
variable "tls_secret_name" {}
|
|
|
|
|
variable "homepage_username" {}
|
|
|
|
|
variable "homepage_password" {}
|
|
|
|
|
variable "db_password" {}
|
|
|
|
|
variable "enroll_key" {}
|
|
|
|
|
variable "crowdsec_dash_api_key" {
|
|
|
|
|
type = string
|
|
|
|
|
sensitive = true
|
|
|
|
|
}
|
|
|
|
|
variable "crowdsec_dash_machine_id" { type = string } # used for web dash
|
|
|
|
|
variable "crowdsec_dash_machine_password" {
|
|
|
|
|
type = string
|
|
|
|
|
sensitive = true
|
|
|
|
|
}
|
|
|
|
|
variable "tier" { type = string }
|
|
|
|
|
variable "slack_webhook_url" { type = string }
|
|
|
|
|
variable "mysql_host" { type = string }
|
truenas deprecation: migrate all non-immich storage to proxmox NFS
- Migrate 7 backup CronJobs to Proxmox host NFS (192.168.1.127)
(etcd, mysql, postgresql, nextcloud, redis, vaultwarden, plotting-book)
- Migrate headscale backup, ebook2audiobook, osm_routing to Proxmox NFS
- Migrate servarr (lidarr, readarr, soulseek) NFS refs to Proxmox
- Remove 79 orphaned TrueNAS NFS module declarations from 49 stacks
- Delete stacks/platform/modules/ (27 dead module copies, 65MB)
- Update nfs-truenas StorageClass to point to Proxmox (192.168.1.127)
- Remove iscsi DNS record from config.tfvars
- Fix woodpecker persistence config and alertmanager PV
Only Immich (8 PVCs, ~1.4TB) remains on TrueNAS.
2026-04-12 14:35:39 +01:00
|
|
|
variable "postgresql_host" { type = string }
|
2026-03-17 18:11:53 +00:00
|
|
|
|
|
|
|
|
module "tls_secret" {
|
|
|
|
|
source = "../../../../modules/kubernetes/setup_tls_secret"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
tls_secret_name = var.tls_secret_name
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resource "kubernetes_namespace" "crowdsec" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec"
|
|
|
|
|
labels = {
|
|
|
|
|
tier = var.tier
|
|
|
|
|
"resource-governance/custom-quota" = "true"
|
|
|
|
|
}
|
|
|
|
|
}
|
[infra] Suppress Goldilocks vpa-update-mode label drift on all namespaces [ci skip]
## 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 in c9d221d5 for
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 in 8d94688d)
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>
2026-04-18 21:15:27 +00:00
|
|
|
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"]]
|
|
|
|
|
}
|
2026-03-17 18:11:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resource "kubernetes_config_map" "crowdsec_custom_scenarios" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-custom-scenarios"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
labels = {
|
|
|
|
|
"app.kubernetes.io/name" = "crowdsec"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data = {
|
|
|
|
|
"http-403-abuse.yaml" = <<-YAML
|
|
|
|
|
type: leaky
|
|
|
|
|
name: crowdsecurity/http-403-abuse
|
|
|
|
|
description: "Detect IPs triggering too many HTTP 403s in NGINX ingress logs"
|
|
|
|
|
filter: "evt.Meta.log_type == 'http_access-log' && evt.Parsed.status == '403'"
|
|
|
|
|
groupby: "evt.Meta.source_ip"
|
|
|
|
|
leakspeed: "2s"
|
|
|
|
|
capacity: 10
|
|
|
|
|
blackhole: 5m
|
|
|
|
|
labels:
|
|
|
|
|
service: http
|
|
|
|
|
behavior: abusive_403
|
|
|
|
|
remediation: true
|
|
|
|
|
YAML
|
|
|
|
|
"http-429-abuse.yaml" : <<-YAML
|
|
|
|
|
type: leaky
|
|
|
|
|
name: crowdsecurity/http-429-abuse
|
|
|
|
|
description: "Detect IPs repeatedly triggering rate-limit (HTTP 429)"
|
|
|
|
|
filter: "evt.Meta.log_type == 'http_access-log' && evt.Parsed.status == '429'"
|
|
|
|
|
groupby: "evt.Meta.source_ip"
|
|
|
|
|
leakspeed: "10s"
|
|
|
|
|
capacity: 5
|
|
|
|
|
blackhole: 1m
|
|
|
|
|
labels:
|
|
|
|
|
service: http
|
|
|
|
|
behavior: rate_limit_abuse
|
|
|
|
|
remediation: true
|
|
|
|
|
YAML
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Whitelist for trusted IPs that should never be blocked
|
|
|
|
|
resource "kubernetes_config_map" "crowdsec_whitelist" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-whitelist"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
labels = {
|
|
|
|
|
"app.kubernetes.io/name" = "crowdsec"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data = {
|
|
|
|
|
"whitelist.yaml" = <<-YAML
|
|
|
|
|
name: crowdsecurity/whitelist-trusted-ips
|
|
|
|
|
description: "Whitelist for trusted IPs that should never be blocked"
|
|
|
|
|
whitelist:
|
|
|
|
|
reason: "Trusted IP - never block"
|
|
|
|
|
ip:
|
|
|
|
|
- "176.12.22.76"
|
|
|
|
|
YAML
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2026-03-23 03:41:13 +02:00
|
|
|
# Syslog acquisition config for pfSense firewall log ingestion
|
|
|
|
|
resource "kubernetes_config_map" "crowdsec_syslog_acquisition" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-syslog-acquisition"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
labels = {
|
|
|
|
|
"app.kubernetes.io/name" = "crowdsec"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data = {
|
|
|
|
|
"syslog.yaml" = <<-YAML
|
|
|
|
|
source: syslog
|
|
|
|
|
listen_addr: "0.0.0.0"
|
|
|
|
|
listen_port: 514
|
|
|
|
|
labels:
|
|
|
|
|
type: pf
|
|
|
|
|
YAML
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2026-03-17 18:11:53 +00:00
|
|
|
resource "helm_release" "crowdsec" {
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
create_namespace = true
|
|
|
|
|
name = "crowdsec"
|
|
|
|
|
atomic = true
|
|
|
|
|
version = "0.21.0"
|
|
|
|
|
|
|
|
|
|
repository = "https://crowdsecurity.github.io/helm-charts"
|
|
|
|
|
chart = "crowdsec"
|
|
|
|
|
|
2026-04-17 12:41:17 +00:00
|
|
|
values = [templatefile("${path.module}/values.yaml", { homepage_username = var.homepage_username, homepage_password = var.homepage_password, DB_PASSWORD = var.db_password, ENROLL_KEY = var.enroll_key, SLACK_WEBHOOK_URL = var.slack_webhook_url, mysql_host = var.mysql_host, postgresql_host = var.postgresql_host })]
|
2026-03-23 03:41:13 +02:00
|
|
|
timeout = 1200
|
2026-03-17 18:11:53 +00:00
|
|
|
wait = true
|
|
|
|
|
wait_for_jobs = true
|
|
|
|
|
}
|
|
|
|
|
|
2026-03-23 03:06:56 +02:00
|
|
|
# NodePort service for pfSense syslog → CrowdSec agent
|
|
|
|
|
# pfSense sends firewall logs to 10.0.20.202:30514 (any k8s node IP works)
|
|
|
|
|
resource "kubernetes_service" "crowdsec_syslog" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-syslog"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
labels = {
|
|
|
|
|
app = "crowdsec-syslog"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
spec {
|
|
|
|
|
type = "NodePort"
|
|
|
|
|
selector = {
|
|
|
|
|
"k8s-app" = "crowdsec"
|
|
|
|
|
type = "agent"
|
|
|
|
|
}
|
|
|
|
|
port {
|
|
|
|
|
name = "syslog-udp"
|
|
|
|
|
port = 514
|
|
|
|
|
target_port = 514
|
|
|
|
|
node_port = 30514
|
|
|
|
|
protocol = "UDP"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2026-03-17 18:11:53 +00:00
|
|
|
|
|
|
|
|
# Deployment for my custom dashboard that helps me unblock myself when I blocklist myself
|
|
|
|
|
resource "kubernetes_deployment" "crowdsec-web" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-web"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
labels = {
|
|
|
|
|
app = "crowdsec_web"
|
|
|
|
|
"kubernetes.io/cluster-service" = "true"
|
|
|
|
|
tier = var.tier
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
spec {
|
|
|
|
|
replicas = 1
|
|
|
|
|
strategy {
|
|
|
|
|
type = "RollingUpdate"
|
|
|
|
|
}
|
|
|
|
|
selector {
|
|
|
|
|
match_labels = {
|
|
|
|
|
app = "crowdsec_web"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
template {
|
|
|
|
|
metadata {
|
|
|
|
|
labels = {
|
|
|
|
|
app = "crowdsec_web"
|
|
|
|
|
"kubernetes.io/cluster-service" = "true"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
spec {
|
|
|
|
|
priority_class_name = "tier-1-cluster"
|
|
|
|
|
container {
|
|
|
|
|
name = "crowdsec-web"
|
|
|
|
|
image = "viktorbarzin/crowdsec_web"
|
|
|
|
|
env {
|
|
|
|
|
name = "CS_API_URL"
|
|
|
|
|
value = "http://crowdsec-service.crowdsec.svc.cluster.local:8080/v1"
|
|
|
|
|
}
|
|
|
|
|
env {
|
|
|
|
|
name = "CS_API_KEY"
|
|
|
|
|
value = var.crowdsec_dash_api_key
|
|
|
|
|
}
|
|
|
|
|
env {
|
|
|
|
|
name = "CS_MACHINE_ID"
|
|
|
|
|
value = var.crowdsec_dash_machine_id
|
|
|
|
|
}
|
|
|
|
|
env {
|
|
|
|
|
name = "CS_MACHINE_PASSWORD"
|
|
|
|
|
value = var.crowdsec_dash_machine_password
|
|
|
|
|
}
|
|
|
|
|
port {
|
|
|
|
|
name = "http"
|
|
|
|
|
container_port = 8000
|
|
|
|
|
protocol = "TCP"
|
|
|
|
|
}
|
|
|
|
|
resources {
|
|
|
|
|
requests = {
|
|
|
|
|
cpu = "15m"
|
|
|
|
|
memory = "128Mi"
|
|
|
|
|
}
|
|
|
|
|
limits = {
|
|
|
|
|
memory = "128Mi"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
dns_config {
|
|
|
|
|
option {
|
|
|
|
|
name = "ndots"
|
|
|
|
|
value = "2"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
[infra] Sweep dns_config ignore_changes across all pod-owning resources [ci skip]
## Context
Wave 3A (commit c9d221d5) 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 in 8d94688d for tls_secret)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 21:19:48 +00:00
|
|
|
lifecycle {
|
|
|
|
|
# KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
|
|
|
|
ignore_changes = [spec[0].template[0].spec[0].dns_config]
|
|
|
|
|
}
|
2026-03-17 18:11:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resource "kubernetes_service" "crowdsec-web" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-web"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
labels = {
|
|
|
|
|
"app" = "crowdsec_web"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
spec {
|
|
|
|
|
selector = {
|
|
|
|
|
app = "crowdsec_web"
|
|
|
|
|
}
|
|
|
|
|
port {
|
|
|
|
|
port = "80"
|
|
|
|
|
target_port = "8000"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
module "ingress" {
|
|
|
|
|
source = "../../../../modules/kubernetes/ingress_factory"
|
2026-04-17 12:41:17 +00:00
|
|
|
dns_type = "proxied"
|
2026-03-17 18:11:53 +00:00
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
name = "crowdsec-web"
|
|
|
|
|
protected = true
|
|
|
|
|
tls_secret_name = var.tls_secret_name
|
|
|
|
|
exclude_crowdsec = true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# CronJob to import public blocklists into CrowdSec
|
|
|
|
|
# https://github.com/wolffcatskyy/crowdsec-blocklist-import
|
|
|
|
|
# Uses kubectl exec to run in an existing CrowdSec agent pod that's already registered
|
|
|
|
|
resource "kubernetes_cron_job_v1" "crowdsec_blocklist_import" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-blocklist-import"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
labels = {
|
|
|
|
|
app = "crowdsec-blocklist-import"
|
|
|
|
|
tier = var.tier
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
spec {
|
|
|
|
|
# Run daily at 4 AM
|
|
|
|
|
schedule = "0 4 * * *"
|
|
|
|
|
timezone = "Europe/London"
|
|
|
|
|
concurrency_policy = "Forbid"
|
|
|
|
|
successful_jobs_history_limit = 3
|
|
|
|
|
failed_jobs_history_limit = 3
|
|
|
|
|
|
|
|
|
|
job_template {
|
|
|
|
|
metadata {
|
|
|
|
|
labels = {
|
|
|
|
|
app = "crowdsec-blocklist-import"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
spec {
|
|
|
|
|
backoff_limit = 3
|
|
|
|
|
template {
|
|
|
|
|
metadata {
|
|
|
|
|
labels = {
|
|
|
|
|
app = "crowdsec-blocklist-import"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
spec {
|
|
|
|
|
service_account_name = kubernetes_service_account.blocklist_import.metadata[0].name
|
|
|
|
|
restart_policy = "OnFailure"
|
|
|
|
|
|
|
|
|
|
container {
|
|
|
|
|
name = "blocklist-import"
|
|
|
|
|
image = "bitnami/kubectl:latest"
|
|
|
|
|
|
|
|
|
|
command = ["/bin/bash", "-c"]
|
|
|
|
|
args = [
|
|
|
|
|
<<-EOF
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
echo "Finding CrowdSec agent pod..."
|
|
|
|
|
AGENT_POD=$(kubectl get pods -n crowdsec -l k8s-app=crowdsec,type=agent -o jsonpath='{.items[0].metadata.name}')
|
|
|
|
|
|
|
|
|
|
if [ -z "$AGENT_POD" ]; then
|
|
|
|
|
echo "ERROR: Could not find CrowdSec agent pod"
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
echo "Using agent pod: $AGENT_POD"
|
|
|
|
|
|
|
|
|
|
# Download the import script
|
|
|
|
|
echo "Downloading blocklist import script..."
|
|
|
|
|
curl -fsSL -o /tmp/import.sh \
|
|
|
|
|
https://raw.githubusercontent.com/wolffcatskyy/crowdsec-blocklist-import/main/import.sh
|
|
|
|
|
chmod +x /tmp/import.sh
|
|
|
|
|
|
|
|
|
|
# Copy script to agent pod and execute
|
|
|
|
|
echo "Copying script to agent pod and executing..."
|
|
|
|
|
kubectl cp /tmp/import.sh crowdsec/$AGENT_POD:/tmp/import.sh
|
|
|
|
|
|
|
|
|
|
kubectl exec -n crowdsec "$AGENT_POD" -- /bin/bash -c '
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
# Run with native mode since we are inside the CrowdSec container
|
|
|
|
|
export MODE=native
|
truenas deprecation: migrate all non-immich storage to proxmox NFS
- Migrate 7 backup CronJobs to Proxmox host NFS (192.168.1.127)
(etcd, mysql, postgresql, nextcloud, redis, vaultwarden, plotting-book)
- Migrate headscale backup, ebook2audiobook, osm_routing to Proxmox NFS
- Migrate servarr (lidarr, readarr, soulseek) NFS refs to Proxmox
- Remove 79 orphaned TrueNAS NFS module declarations from 49 stacks
- Delete stacks/platform/modules/ (27 dead module copies, 65MB)
- Update nfs-truenas StorageClass to point to Proxmox (192.168.1.127)
- Remove iscsi DNS record from config.tfvars
- Fix woodpecker persistence config and alertmanager PV
Only Immich (8 PVCs, ~1.4TB) remains on TrueNAS.
2026-04-12 14:35:39 +01:00
|
|
|
export DECISION_DURATION=168h
|
2026-03-17 18:11:53 +00:00
|
|
|
export FETCH_TIMEOUT=60
|
|
|
|
|
export LOG_LEVEL=INFO
|
|
|
|
|
|
|
|
|
|
/tmp/import.sh
|
|
|
|
|
|
|
|
|
|
# Cleanup
|
|
|
|
|
rm -f /tmp/import.sh
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
echo "Blocklist import completed successfully!"
|
|
|
|
|
EOF
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
[infra] Sweep dns_config ignore_changes across all pod-owning resources [ci skip]
## Context
Wave 3A (commit c9d221d5) 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 in 8d94688d for tls_secret)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 21:19:48 +00:00
|
|
|
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]
|
|
|
|
|
}
|
2026-03-17 18:11:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Service account for the blocklist import job (needs kubectl exec permissions)
|
|
|
|
|
resource "kubernetes_service_account" "blocklist_import" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-blocklist-import"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resource "kubernetes_role" "blocklist_import" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-blocklist-import"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rule {
|
|
|
|
|
api_groups = [""]
|
|
|
|
|
resources = ["pods"]
|
|
|
|
|
verbs = ["get", "list"]
|
|
|
|
|
}
|
|
|
|
|
rule {
|
|
|
|
|
api_groups = [""]
|
|
|
|
|
resources = ["pods/exec"]
|
|
|
|
|
verbs = ["create"]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resource "kubernetes_role_binding" "blocklist_import" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-blocklist-import"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
role_ref {
|
|
|
|
|
api_group = "rbac.authorization.k8s.io"
|
|
|
|
|
kind = "Role"
|
|
|
|
|
name = kubernetes_role.blocklist_import.metadata[0].name
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
subject {
|
|
|
|
|
kind = "ServiceAccount"
|
|
|
|
|
name = kubernetes_service_account.blocklist_import.metadata[0].name
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Custom ResourceQuota for CrowdSec — needs more than default 1-cluster quota
|
|
|
|
|
# because it runs DaemonSet agents (1 per worker node) + 3 LAPI replicas + web UI
|
|
|
|
|
resource "kubernetes_resource_quota" "crowdsec" {
|
|
|
|
|
metadata {
|
|
|
|
|
name = "crowdsec-quota"
|
|
|
|
|
namespace = kubernetes_namespace.crowdsec.metadata[0].name
|
|
|
|
|
}
|
|
|
|
|
spec {
|
|
|
|
|
hard = {
|
|
|
|
|
"requests.cpu" = "4"
|
|
|
|
|
"requests.memory" = "8Gi"
|
|
|
|
|
"limits.memory" = "16Gi"
|
|
|
|
|
pods = "30"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|