## 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>
450 lines
11 KiB
HCL
450 lines
11 KiB
HCL
variable "tls_secret_name" {
|
|
type = string
|
|
sensitive = true
|
|
}
|
|
variable "mysql_host" { type = string }
|
|
|
|
data "vault_kv_secret_v2" "secrets" {
|
|
mount = "secret"
|
|
name = "url"
|
|
}
|
|
|
|
## Setup
|
|
## Need to manually add
|
|
## user: shlink
|
|
## password: var.url_shortener_mysql_password
|
|
## to the mysql tier
|
|
|
|
variable "domain" {
|
|
default = "url.viktorbarzin.me"
|
|
}
|
|
|
|
resource "kubernetes_namespace" "shlink" {
|
|
metadata {
|
|
name = "url"
|
|
labels = {
|
|
"istio-injection" : "disabled"
|
|
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 = "url-secrets"
|
|
namespace = "url"
|
|
}
|
|
spec = {
|
|
refreshInterval = "15m"
|
|
secretStoreRef = {
|
|
name = "vault-kv"
|
|
kind = "ClusterSecretStore"
|
|
}
|
|
target = {
|
|
name = "url-secrets"
|
|
}
|
|
dataFrom = [{
|
|
extract = {
|
|
key = "url"
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
depends_on = [kubernetes_namespace.shlink]
|
|
}
|
|
|
|
# DB credentials from Vault database engine (rotated every 24h)
|
|
# NOTE: The kubernetes_secret "mysql_config" still uses plan-time db_password
|
|
# from KV. This ExternalSecret provides runtime-refreshed credentials. Once
|
|
# the deployment is migrated to use env_from with this secret, the plan-time
|
|
# kubernetes_secret can be removed.
|
|
resource "kubernetes_manifest" "db_external_secret" {
|
|
manifest = {
|
|
apiVersion = "external-secrets.io/v1beta1"
|
|
kind = "ExternalSecret"
|
|
metadata = {
|
|
name = "url-db-creds"
|
|
namespace = "url"
|
|
}
|
|
spec = {
|
|
refreshInterval = "15m"
|
|
secretStoreRef = {
|
|
name = "vault-database"
|
|
kind = "ClusterSecretStore"
|
|
}
|
|
target = {
|
|
name = "url-db-creds"
|
|
template = {
|
|
data = {
|
|
DB_USER = "shlink"
|
|
DB_PASSWORD = "{{ .password }}"
|
|
}
|
|
}
|
|
}
|
|
data = [{
|
|
secretKey = "password"
|
|
remoteRef = {
|
|
key = "static-creds/mysql-shlink"
|
|
property = "password"
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
depends_on = [kubernetes_namespace.shlink]
|
|
}
|
|
|
|
module "tls_secret" {
|
|
source = "../../modules/kubernetes/setup_tls_secret"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|
|
|
|
resource "kubernetes_secret" "mysql_config" {
|
|
metadata {
|
|
name = "mysql-config"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
annotations = {
|
|
"reloader.stakater.com/match" = "true"
|
|
}
|
|
}
|
|
data = {
|
|
"DB_USER" = "shlink"
|
|
"DB_PASSWORD" = data.vault_kv_secret_v2.secrets.data["db_password"]
|
|
}
|
|
}
|
|
|
|
# this depends on the mysql installation
|
|
# resource "kubectl_manifest" "mysql-user" {
|
|
# yaml_body = <<-YAML
|
|
# apiVersion: mysql.presslabs.org/v1alpha1
|
|
# kind: MysqlUser
|
|
# metadata:
|
|
# name: shlink
|
|
# namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
# spec:
|
|
# user: shlink
|
|
# clusterRef:
|
|
# name: mysql-cluster
|
|
# namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
# password:
|
|
# name: mysql-config
|
|
# key: password
|
|
# allowedHosts:
|
|
# - '%'
|
|
# YAML
|
|
# # permissions:
|
|
# # - schema: db-name-in-mysql
|
|
# # tables: ["table1", "table2"]
|
|
# # permissions:
|
|
# # - SELECT
|
|
# # - UPDATE
|
|
# # - CREATE
|
|
# # allowedHosts:
|
|
# # - localhost
|
|
# }
|
|
|
|
resource "kubernetes_deployment" "shlink" {
|
|
metadata {
|
|
name = "shlink"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
labels = {
|
|
run = "shlink"
|
|
tier = local.tiers.aux
|
|
}
|
|
annotations = {
|
|
"reloader.stakater.com/auto" = "true"
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
selector {
|
|
match_labels = {
|
|
run = "shlink"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
run = "shlink"
|
|
}
|
|
annotations = {
|
|
"diun.enable" = "true"
|
|
"diun.include_tags" = "^\\d+\\.\\d+\\.\\d+$"
|
|
"dependency.kyverno.io/wait-for" = "mysql.dbaas:3306"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
image = "shlinkio/shlink:5.0.2"
|
|
name = "shlink"
|
|
env {
|
|
name = "DEFAULT_DOMAIN"
|
|
value = var.domain
|
|
}
|
|
env {
|
|
name = "SHORT_DOMAIN_SCHEMA"
|
|
value = "https"
|
|
}
|
|
env {
|
|
name = "GEOLITE_LICENSE_KEY"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "url-secrets"
|
|
key = "geolite_license_key"
|
|
}
|
|
}
|
|
}
|
|
# DB config
|
|
env {
|
|
name = "DB_DRIVER"
|
|
value = "mysql"
|
|
}
|
|
env {
|
|
name = "DB_HOST"
|
|
value = var.mysql_host
|
|
}
|
|
# env {
|
|
# name = "DB_USER"
|
|
# value = "shlink"
|
|
# }
|
|
env_from {
|
|
secret_ref {
|
|
name = "url-db-creds"
|
|
}
|
|
}
|
|
# env {
|
|
# name = "DB_PASSWORD"
|
|
# value = data.vault_kv_secret_v2.secrets.data["db_password"]
|
|
# }
|
|
resources {
|
|
limits = {
|
|
memory = "960Mi"
|
|
}
|
|
requests = {
|
|
cpu = "25m"
|
|
memory = "960Mi"
|
|
}
|
|
}
|
|
port {
|
|
container_port = 8080
|
|
}
|
|
liveness_probe {
|
|
http_get {
|
|
path = "/rest/v3/health"
|
|
port = 8080
|
|
}
|
|
initial_delay_seconds = 15
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 5
|
|
}
|
|
readiness_probe {
|
|
http_get {
|
|
path = "/rest/v3/health"
|
|
port = 8080
|
|
}
|
|
initial_delay_seconds = 5
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 3
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
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" "shlink" {
|
|
metadata {
|
|
name = "shlink"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
labels = {
|
|
"run" = "shlink"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
run = "shlink"
|
|
}
|
|
port {
|
|
name = "http"
|
|
port = "80"
|
|
target_port = "8080"
|
|
}
|
|
}
|
|
}
|
|
|
|
module "ingress" {
|
|
source = "../../modules/kubernetes/ingress_factory"
|
|
dns_type = "proxied"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
name = "url"
|
|
service_name = "shlink"
|
|
tls_secret_name = var.tls_secret_name
|
|
extra_annotations = {
|
|
"gethomepage.dev/enabled" = "true"
|
|
"gethomepage.dev/name" = "Shlink"
|
|
"gethomepage.dev/description" = "URL shortener"
|
|
"gethomepage.dev/icon" = "shlink.png"
|
|
"gethomepage.dev/group" = "Productivity"
|
|
"gethomepage.dev/pod-selector" = ""
|
|
"gethomepage.dev/widget.type" = "shlink"
|
|
"gethomepage.dev/widget.url" = "http://shlink.shlink.svc.cluster.local:8080"
|
|
"gethomepage.dev/widget.key" = data.vault_kv_secret_v2.secrets.data["api_key"]
|
|
}
|
|
}
|
|
|
|
|
|
# Shlink web client
|
|
|
|
resource "kubernetes_config_map" "shlink-web" {
|
|
metadata {
|
|
name = "shlink-web-servers"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
|
|
annotations = {
|
|
"reloader.stakater.com/match" = "true"
|
|
}
|
|
}
|
|
|
|
data = {
|
|
"servers.json" = jsonencode([{
|
|
name = "Main"
|
|
url = "https://url.viktorbarzin.me"
|
|
apiKey = data.vault_kv_secret_v2.secrets.data["api_key"]
|
|
}])
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_deployment" "shlink-web" {
|
|
metadata {
|
|
name = "shlink-web"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
labels = {
|
|
run = "shlink-web"
|
|
tier = local.tiers.aux
|
|
}
|
|
annotations = {
|
|
"reloader.stakater.com/search" = "true"
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
selector {
|
|
match_labels = {
|
|
run = "shlink-web"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
run = "shlink-web"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
image = "shlinkio/shlink-web-client"
|
|
name = "shlink-web"
|
|
volume_mount {
|
|
mount_path = "/usr/share/nginx/html/servers.json"
|
|
sub_path = "servers.json"
|
|
name = "config"
|
|
}
|
|
resources {
|
|
limits = {
|
|
memory = "64Mi"
|
|
}
|
|
requests = {
|
|
cpu = "10m"
|
|
memory = "64Mi"
|
|
}
|
|
}
|
|
port {
|
|
container_port = 8080
|
|
}
|
|
liveness_probe {
|
|
http_get {
|
|
path = "/"
|
|
port = 8080
|
|
}
|
|
initial_delay_seconds = 15
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 5
|
|
}
|
|
readiness_probe {
|
|
http_get {
|
|
path = "/"
|
|
port = 8080
|
|
}
|
|
initial_delay_seconds = 5
|
|
period_seconds = 30
|
|
timeout_seconds = 5
|
|
failure_threshold = 3
|
|
}
|
|
}
|
|
volume {
|
|
name = "config"
|
|
config_map {
|
|
name = "shlink-web-servers"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
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" "shlink-web" {
|
|
metadata {
|
|
name = "shlink-web"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
labels = {
|
|
"run" = "shlink-web"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
run = "shlink-web"
|
|
}
|
|
port {
|
|
name = "http"
|
|
port = 80
|
|
target_port = 8080
|
|
}
|
|
}
|
|
}
|
|
|
|
module "ingress-web" {
|
|
source = "../../modules/kubernetes/ingress_factory"
|
|
dns_type = "proxied"
|
|
namespace = kubernetes_namespace.shlink.metadata[0].name
|
|
name = "shlink"
|
|
service_name = "shlink-web"
|
|
tls_secret_name = var.tls_secret_name
|
|
protected = true
|
|
extra_annotations = {
|
|
"gethomepage.dev/enabled" = "false"
|
|
"gethomepage.dev/name" = "Shlink Web"
|
|
"gethomepage.dev/description" = "URL shortener web client"
|
|
"gethomepage.dev/icon" = "shlink.png"
|
|
"gethomepage.dev/group" = "Productivity"
|
|
"gethomepage.dev/pod-selector" = ""
|
|
}
|
|
}
|