## Context
Phase 1 of the state-drift consolidation audit (plan Wave 3) identified that
the entire repo leans on a repeated `lifecycle { ignore_changes = [...dns_config] }`
snippet to suppress Kyverno's admission-webhook dns_config mutation (the ndots=2
override that prevents NxDomain search-domain flooding). 27 occurrences across
19 stacks. Without this suppression, every pod-owning resource shows perpetual
TF plan drift.
The original plan proposed a shared `modules/kubernetes/kyverno_lifecycle/`
module emitting the ignore-paths list as an output that stacks would consume in
their `ignore_changes` blocks. That approach is architecturally impossible:
Terraform's `ignore_changes` meta-argument accepts only static attribute paths
— it rejects module outputs, locals, variables, and any expression (the HCL
spec evaluates `lifecycle` before the regular expression graph). So a DRY
module cannot exist. The canonical pattern IS the repeated snippet.
What the snippet was missing was a *discoverability tag* so that (a) new
resources can be validated for compliance, (b) the existing 27 sites can be
grep'd in a single command, and (c) future maintainers understand the
convention rather than each reinventing it.
## This change
- Introduces `# KYVERNO_LIFECYCLE_V1` as the canonical marker comment.
Attached inline on every `spec[0].template[0].spec[0].dns_config` line
(or `spec[0].job_template[0].spec[0]...` for CronJobs) across all 27
existing suppression sites.
- Documents the convention with rationale and copy-paste snippets in
`AGENTS.md` → new "Kyverno Drift Suppression" section.
- Expands the existing `.claude/CLAUDE.md` Kyverno ndots note to reference
the marker and explain why the module approach is blocked.
- Updates `_template/main.tf.example` so every new stack starts compliant.
## What is NOT in this change
- The `kubernetes_manifest` Kyverno annotation drift (beads `code-seq`)
— that is Phase B with a sibling `# KYVERNO_MANIFEST_V1` marker.
- Behavioral changes — every `ignore_changes` list is byte-identical
save for the inline comment.
- The fallback module the original plan anticipated — skipped because
Terraform rejects expressions in `ignore_changes`.
- `terraform fmt` cleanup on adjacent unrelated blocks in three files
(claude-agent-service, freedify/factory, hermes-agent). Reverted to
keep this commit scoped to the convention rollout.
## Before / after
Before (cannot distinguish accidental-forgotten from intentional-convention):
```hcl
lifecycle {
ignore_changes = [spec[0].template[0].spec[0].dns_config]
}
```
After (greppable, self-documenting, discoverable by tooling):
```hcl
lifecycle {
ignore_changes = [spec[0].template[0].spec[0].dns_config] # KYVERNO_LIFECYCLE_V1
}
```
## Test Plan
### Automated
```
$ rg -c 'KYVERNO_LIFECYCLE_V1' stacks/ --include='*.tf' --include='*.tf.example' \
| awk -F: '{s+=$2} END {print s}'
27
$ git diff --stat | grep -E '\.(tf|tf\.example|md)$' | wc -l
21
# All code-file diffs are 1 insertion + 1 deletion per marker site,
# except beads-server (3), ebooks (4), immich (3), uptime-kuma (2).
$ git diff --stat stacks/ | tail -1
20 files changed, 45 insertions(+), 28 deletions(-)
```
### Manual Verification
No apply required — HCL comments only. Zero effect on any stack's plan output.
Future audits: `rg 'KYVERNO_LIFECYCLE_V1' stacks/ | wc -l` must grow as new
pod-owning resources are added.
## Reproduce locally
1. `cd infra && git pull`
2. `rg 'KYVERNO_LIFECYCLE_V1' stacks/` → expect 27 hits in 19 files
3. Grep any new `kubernetes_deployment` for the marker; absence = missing
suppression.
Closes: code-28m
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
299 lines
7.2 KiB
HCL
299 lines
7.2 KiB
HCL
variable "tls_secret_name" {
|
|
type = string
|
|
sensitive = true
|
|
}
|
|
data "vault_kv_secret_v2" "secrets" {
|
|
mount = "secret"
|
|
name = "webhook-handler"
|
|
}
|
|
|
|
|
|
resource "kubernetes_namespace" "webhook-handler" {
|
|
metadata {
|
|
name = "webhook-handler"
|
|
labels = {
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
}
|
|
|
|
module "tls_secret" {
|
|
source = "../../modules/kubernetes/setup_tls_secret"
|
|
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|
|
|
|
resource "kubernetes_cluster_role" "deployment_updater" {
|
|
metadata {
|
|
name = "deployment-updater"
|
|
}
|
|
|
|
rule {
|
|
verbs = ["create", "update", "get", "patch", "list"]
|
|
api_groups = ["extensions", "apps", ""]
|
|
resources = ["deployments", "namespaces", "pods", "services"]
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_cluster_role_binding" "update_deployment_binding" {
|
|
metadata {
|
|
name = "update-deployment-binding"
|
|
}
|
|
|
|
subject {
|
|
kind = "ServiceAccount"
|
|
name = "default"
|
|
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
|
}
|
|
|
|
role_ref {
|
|
api_group = "rbac.authorization.k8s.io"
|
|
kind = "ClusterRole"
|
|
name = "deployment-updater"
|
|
}
|
|
}
|
|
|
|
|
|
resource "kubernetes_secret" "ssh-key" {
|
|
metadata {
|
|
name = "ssh-key"
|
|
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
|
|
|
annotations = {
|
|
"reloader.stakater.com/match" = "true"
|
|
}
|
|
}
|
|
data = {
|
|
"id_rsa" = data.vault_kv_secret_v2.secrets.data["ssh_key"]
|
|
}
|
|
type = "generic"
|
|
}
|
|
resource "kubernetes_deployment" "webhook_handler" {
|
|
metadata {
|
|
name = "webhook-handler"
|
|
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
|
labels = {
|
|
app = "webhook-handler"
|
|
tier = local.tiers.aux
|
|
}
|
|
annotations = {
|
|
"reloader.stakater.com/auto" = "true"
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
selector {
|
|
match_labels = {
|
|
app = "webhook-handler"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "webhook-handler"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
# security_context {
|
|
# run_as_user = 1000
|
|
# }
|
|
# lifecycle {
|
|
# post_start {
|
|
# exec {
|
|
# # Must be kept in sycn with webhook_handler dockerfile
|
|
# command = ["echo", "\"$SSH_KEY\"", ">", "/opt/id_rsa", "&&", "chown", "appuser", "/opt/id_rsa", "&&", "chmod", "600", "/opt/id_rsa"]
|
|
# }
|
|
# }
|
|
# }
|
|
image = "viktorbarzin/webhook-handler:latest"
|
|
name = "webhook-handler"
|
|
resources {
|
|
limits = {
|
|
memory = "64Mi"
|
|
}
|
|
requests = {
|
|
cpu = "10m"
|
|
memory = "64Mi"
|
|
}
|
|
}
|
|
port {
|
|
container_port = 80
|
|
}
|
|
volume_mount {
|
|
name = "id-rsa"
|
|
mount_path = "/opt/id_rsa"
|
|
sub_path = "id_rsa"
|
|
}
|
|
env {
|
|
name = "WEBHOOKSECRET"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "secret"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "FB_APP_SECRET"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "fb_app_secret"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "FB_VERIFY_TOKEN"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "fb_verify_token"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "FB_PAGE_TOKEN"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "fb_page_token"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "CONFIG"
|
|
value = "./chatbot/config/viktorwebservices.yaml"
|
|
}
|
|
env {
|
|
name = "GIT_USER"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "git_user"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "GIT_TOKEN"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "git_token"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "SSH_KEY"
|
|
value = "/opt/id_rsa"
|
|
}
|
|
env {
|
|
name = "WOODPECKER_API_URL"
|
|
value = "https://ci.viktorbarzin.me"
|
|
}
|
|
env {
|
|
name = "WOODPECKER_TOKEN"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "woodpecker_token"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "WOODPECKER_INFRA_REPO_ID"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "woodpecker_infra_repo_id"
|
|
}
|
|
}
|
|
}
|
|
env {
|
|
name = "AUTHENTIK_WEBHOOK_SECRET"
|
|
value_from {
|
|
secret_key_ref {
|
|
name = "webhook-handler-secrets"
|
|
key = "authentik_webhook_secret"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
volume {
|
|
name = "id-rsa"
|
|
secret {
|
|
secret_name = "ssh-key"
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
lifecycle {
|
|
ignore_changes = [spec[0].template[0].spec[0].dns_config] # KYVERNO_LIFECYCLE_V1
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "webhook_handler" {
|
|
metadata {
|
|
name = "webhook-handler"
|
|
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
|
labels = {
|
|
"app" = "webhook-handler"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
app = "webhook-handler"
|
|
}
|
|
port {
|
|
port = "80"
|
|
target_port = "3000"
|
|
}
|
|
}
|
|
}
|
|
|
|
module "ingress" {
|
|
source = "../../modules/kubernetes/ingress_factory"
|
|
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
|
name = "webhook-handler"
|
|
host = "webhook"
|
|
dns_type = "non-proxied"
|
|
tls_secret_name = var.tls_secret_name
|
|
extra_annotations = {
|
|
"gethomepage.dev/enabled" = "true"
|
|
"gethomepage.dev/name" = "Webhook Handler"
|
|
"gethomepage.dev/description" = "Webhook relay"
|
|
"gethomepage.dev/icon" = "webhook.png"
|
|
"gethomepage.dev/group" = "Automation"
|
|
"gethomepage.dev/pod-selector" = ""
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_manifest" "external_secret" {
|
|
manifest = {
|
|
apiVersion = "external-secrets.io/v1beta1"
|
|
kind = "ExternalSecret"
|
|
metadata = {
|
|
name = "webhook-handler-secrets"
|
|
namespace = "webhook-handler"
|
|
}
|
|
spec = {
|
|
refreshInterval = "15m"
|
|
secretStoreRef = {
|
|
name = "vault-kv"
|
|
kind = "ClusterSecretStore"
|
|
}
|
|
target = {
|
|
name = "webhook-handler-secrets"
|
|
}
|
|
dataFrom = [{
|
|
extract = {
|
|
key = "webhook-handler"
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
depends_on = [kubernetes_namespace.webhook-handler]
|
|
}
|