fix: grant vault deployer access to manage the litellm engine

Applying the litellm mount failed with 403 permission denied on
PUT litellm/config: the deployer identity (tf_vault approle /
woodpecker_terraform_vault k8s role) could enable the mount via
sys/mounts/admin but had no policy covering the engine's own data paths.

Add a litellm/admin policy granting create/read/update/delete on
litellm/config and litellm/roles/*, assigned to the same auth roles as the
other secret-engine admin policies.

.woodpecker/apply.yaml

@@ -7,9 +7,8 @@ steps:
     image: git.unkin.net/unkin/almalinux9-opentofu:20260606
     environment:
       VAULT_AUTH_METHOD: kubernetes
-      VAULT_VERSION: "1.20.0"
     commands:
-      - curl -fsSL -o /tmp/vault.zip "https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/hashicorp-releases/vault/$${VAULT_VERSION}/vault_$${VAULT_VERSION}_linux_amd64.zip" && python3 -m zipfile -e /tmp/vault.zip /tmp/ && install -m0755 /tmp/vault /usr/local/bin/vault && rm -f /tmp/vault.zip /tmp/vault /tmp/LICENSE.txt
+      - dnf install vault -y
       - make plan
       - make apply
     backend_options:

.woodpecker/plan.yaml

@@ -6,9 +6,8 @@ steps:
     image: git.unkin.net/unkin/almalinux9-opentofu:20260606
     environment:
       VAULT_AUTH_METHOD: kubernetes
-      VAULT_VERSION: "1.20.0"
     commands:
-      - curl -fsSL -o /tmp/vault.zip "https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/hashicorp-releases/vault/$${VAULT_VERSION}/vault_$${VAULT_VERSION}_linux_amd64.zip" && python3 -m zipfile -e /tmp/vault.zip /tmp/ && install -m0755 /tmp/vault /usr/local/bin/vault && rm -f /tmp/vault.zip /tmp/vault /tmp/LICENSE.txt
+      - dnf install vault -y
       - make plan
     backend_options:
       kubernetes:

Makefile

@@ -22,7 +22,7 @@ init:
 
 plan: init
 	@$(call vault_env) && \
-	terragrunt run --all --parallelism 4 --non-interactive plan -- -lock=false
+	terragrunt run --all --parallelism 4 --non-interactive plan
 
 apply: init
 	@$(call vault_env) && \

config/arrstack_secret_backend/arrstack.yaml

@@ -1,9 +0,0 @@
-# Mounts the arrstack dynamic secrets engine at "arrstack" and writes its config.
-# The arrproxy admin token is sensitive and read from KV, not stored here:
-#   kv/kubernetes/namespace/arrstack/default/arrproxy-admin-token -> key "token"
-# (seeded by argocd-apps #384). arrstack.unkin.net terminates on traefik-external
-# with an internal-CA cert the OpenBao nodes already trust, so ca_cert is omitted
-# (system trust store), mirroring the gitea engine against git.unkin.net.
-description: "arrstack dynamic arrproxy API keys"
-base_url: "https://arrstack.unkin.net"
-request_timeout_seconds: 30

config/arrstack_secret_backend_role/arrstack/all.yaml

@@ -1,9 +0,0 @@
----
-# Mints an arrproxy API key scoped to all three arr apps.
-apps:
-  - prowlarr
-  - radarr
-  - sonarr
-ttl: 60        # seconds (1m); short-lived by design, renewed on demand
-max_ttl: 86400 # seconds (24h); the engine additionally caps renewal at the
-               # arrproxy admin token's fixed mint expiry.

config/arrstack_secret_backend_role/arrstack/mediamark.yaml

@@ -1,17 +0,0 @@
----
-# Mints an arrproxy API key for the mediamark kids-content marking UI, scoped to
-# Sonarr and Radarr only (no Prowlarr: mediamark never touches indexers).
-#
-# mediamark only lists series/movies and reads metadata + artwork, so its key is
-# read-only in intent. The engine role cannot express that today: an
-# arrstack_secret_backend_role carries apps/ttl/max_ttl only, and arrproxy scopes
-# machine tokens by app, not by HTTP method (the GET/HEAD restriction on the
-# cheeztv/kids tier is a grant on an OIDC *group*, not on a minted token). Until
-# the engine and arrproxy grow per-token method scoping, mediamark's read-only
-# posture is enforced by the app itself and by the arrproxy tier it routes to.
-apps:
-  - radarr
-  - sonarr
-ttl: 60        # seconds (1m); short-lived by design, renewed on demand
-max_ttl: 86400 # seconds (24h); the engine additionally caps renewal at the
-               # arrproxy admin token's fixed mint expiry.

config/arrstack_secret_backend_role/arrstack/prowlarr.yaml

@@ -1,7 +0,0 @@
----
-# Mints an arrproxy API key scoped to Prowlarr only.
-apps:
-  - prowlarr
-ttl: 60        # seconds (1m); short-lived by design, renewed on demand
-max_ttl: 86400 # seconds (24h); the engine additionally caps renewal at the
-               # arrproxy admin token's fixed mint expiry.

config/arrstack_secret_backend_role/arrstack/radarr.yaml

@@ -1,7 +0,0 @@
----
-# Mints an arrproxy API key scoped to Radarr only.
-apps:
-  - radarr
-ttl: 60        # seconds (1m); short-lived by design, renewed on demand
-max_ttl: 86400 # seconds (24h); the engine additionally caps renewal at the
-               # arrproxy admin token's fixed mint expiry.

config/arrstack_secret_backend_role/arrstack/sonarr.yaml

@@ -1,7 +0,0 @@
----
-# Mints an arrproxy API key scoped to Sonarr only.
-apps:
-  - sonarr
-ttl: 60        # seconds (1m); short-lived by design, renewed on demand
-max_ttl: 86400 # seconds (24h); the engine additionally caps renewal at the
-               # arrproxy admin token's fixed mint expiry.

config/auth_approle_role/approle/agents.yaml

@@ -1,6 +0,0 @@
-token_ttl: 3600
-token_max_ttl: 14400
-bind_secret_id: false
-token_bound_cidrs:
-  - "10.10.12.200/32"
-use_deterministic_role_id: true

config/auth_approle_role/approle/terraform_enc.yaml

@@ -1,9 +0,0 @@
-token_ttl: 120
-token_max_ttl: 120
-bind_secret_id: false
-token_bound_cidrs:
-  - "10.10.12.200/32"
-  - "198.18.25.102/32"
-  - "198.18.26.91/32"
-  - "198.18.27.40/32"
-use_deterministic_role_id: true

config/auth_approle_role/approle/terraform_rancher.yaml

@@ -1,9 +0,0 @@
-token_ttl: 120
-token_max_ttl: 120
-bind_secret_id: false
-token_bound_cidrs:
-  - "10.10.12.200/32"
-  - "198.18.25.102/32"
-  - "198.18.26.91/32"
-  - "198.18.27.40/32"
-use_deterministic_role_id: true

config/auth_kubernetes_role/k8s/au/syd1/logging_logarchiver.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - logarchiver
-bound_service_account_namespaces:
-  - logging
-token_ttl: 600
-token_max_ttl: 600
-audience: vault

config/auth_kubernetes_role/k8s/au/syd1/mediamark.yaml

@@ -1,10 +0,0 @@
----
-# Kubernetes auth role for the mediamark app: the default service account in the
-# mediamark namespace, used by VaultDynamicSecret to read arrstack/creds/mediamark.
-bound_service_account_names:
-  - default
-bound_service_account_namespaces:
-  - mediamark
-token_ttl: 600
-token_max_ttl: 600
-audience: vault

config/auth_kubernetes_role/k8s/au/syd1/repospawner.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - repospawner
-bound_service_account_namespaces:
-  - repospawner
-token_ttl: 600
-token_max_ttl: 600
-audience: vault

config/auth_kubernetes_role/k8s/au/syd1/woodpecker_terraform_enc.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-enc
-bound_service_account_namespaces:
-  - woodpecker
-token_ttl: 600
-token_max_ttl: 600
-audience: https://kubernetes.default.svc.cluster.local

config/auth_kubernetes_role/k8s/au/syd1/woodpecker_terraform_infra.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-infra
-bound_service_account_namespaces:
-  - woodpecker
-token_ttl: 600
-token_max_ttl: 600
-audience: https://kubernetes.default.svc.cluster.local

config/auth_kubernetes_role/k8s/au/syd1/woodpecker_terraform_rancher.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-rancher
-bound_service_account_namespaces:
-  - woodpecker
-token_ttl: 600
-token_max_ttl: 600
-audience: https://kubernetes.default.svc.cluster.local

config/auth_oidc_backend/oidc.yaml

@@ -1,17 +0,0 @@
-# Authentik (OIDC) human SSO. The mount path is the filename and MUST stay
-# "oidc": the Authentik provider registers strict redirect URIs containing
-# /ui/vault/auth/oidc/oidc/callback, which encode the mount path.
-#
-# identity.unkin.net serves the public LetsEncrypt wildcard, so the OpenBao VMs
-# validate discovery against the system roots with no CA bundle work. Do not
-# swap it for identity.k8s.syd1.au.unkin.net (internal CA).
-#
-# listing_visibility unauth makes OIDC the offered default on the UI login page.
-# client_id/client_secret are read from kv/service/authentik/oidc-vault.
----
-oidc_discovery_url: "https://identity.unkin.net/application/o/vault/"
-default_role: "default"
-description: "Authentik SSO - default human login"
-listing_visibility: "unauth"
-default_lease_ttl: 24h
-max_lease_ttl: 168h

config/auth_oidc_group/oidc/akP-vault-admin.yaml

@@ -1,5 +0,0 @@
----
-# this file doesnt need anything in it, so this data is just to make sure yamlencode reads some yaml data
-# The filename is the Authentik group name asserted in the ak_groups claim.
-# Only akP-* permission groups may appear here; akR-* roles are grouping-only.
-description: foo

config/auth_oidc_role/oidc/default.yaml

@@ -1,25 +0,0 @@
-# Default OIDC login role (the mount's default_role), used by both the web UI
-# and `bao login -method=oidc`.
-#
-# The role grants no policies of its own: authorization comes from the external
-# identity groups under config/auth_oidc_group, matched on the ak_groups claim.
-# ak_groups is Authentik's hierarchy-expanding claim (plain `groups` only carries
-# direct memberships), so nested akP-* permission groups resolve.
-#
-# allowed_redirect_uris must match the provider's strict URIs exactly.
----
-user_claim: "email"
-groups_claim: "ak_groups"
-oidc_scopes:
-  - openid
-  - profile
-  - email
-  - ak_groups
-bound_audiences:
-  - vault
-allowed_redirect_uris:
-  - "http://localhost:8250/oidc/callback"
-  - "https://vault.k8s.syd1.au.unkin.net/ui/vault/auth/oidc/oidc/callback"
-  - "https://vault.service.consul:8200/ui/vault/auth/oidc/oidc/callback"
-token_ttl: 3600
-token_max_ttl: 28800

config/config.hcl

@@ -97,27 +97,6 @@ locals {
       })
       if startswith(file_path, "auth_ldap_group/")
     }
-    auth_oidc_backend = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => content
-      if startswith(file_path, "auth_oidc_backend/")
-    }
-    auth_oidc_role = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "auth_oidc_role/", ""), ".yaml") => merge(content, {
-        role_name = trimsuffix(basename(file_path), ".yaml")
-        backend   = dirname(replace(file_path, "auth_oidc_role/", ""))
-      })
-      if startswith(file_path, "auth_oidc_role/")
-    }
-    auth_oidc_group = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "auth_oidc_group/", ""), ".yaml") => merge(content, {
-        groupname = trimsuffix(basename(file_path), ".yaml")
-        backend   = split("/", replace(file_path, "auth_oidc_group/", ""))[0]
-      })
-      if startswith(file_path, "auth_oidc_group/")
-    }
     auth_kubernetes_backend = {
       for file_path, content in local.all_configs :
       trimsuffix(replace(file_path, "auth_kubernetes_backend/", ""), ".yaml") => content
@@ -219,99 +198,5 @@ locals {
       })
       if startswith(file_path, "litellm_secret_backend_role/")
     }
-    arrstack_secret_backend = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => content
-      if startswith(file_path, "arrstack_secret_backend/")
-    }
-    arrstack_secret_backend_role = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "arrstack_secret_backend_role/", ""), ".yaml") => merge(content, {
-        name    = trimsuffix(basename(file_path), ".yaml")
-        backend = dirname(replace(file_path, "arrstack_secret_backend_role/", ""))
-      })
-      if startswith(file_path, "arrstack_secret_backend_role/")
-    }
-    plugins = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => merge(content, {
-        name = trimsuffix(basename(file_path), ".yaml")
-      })
-      if startswith(file_path, "plugins/")
-    }
-    gpg_secret_backend = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => content
-      if startswith(file_path, "gpg_secret_backend/")
-    }
-    gpg_key = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "gpg_key/", ""), ".yaml") => merge(content, {
-        name    = trimsuffix(basename(file_path), ".yaml")
-        backend = dirname(replace(file_path, "gpg_key/", ""))
-      })
-      if startswith(file_path, "gpg_key/")
-    }
-    rancher_secret_backend = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => content
-      if startswith(file_path, "rancher_secret_backend/")
-    }
-    rancher_secret_backend_service_account = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "rancher_secret_backend_service_account/", ""), ".yaml") => merge(content, {
-        name    = trimsuffix(basename(file_path), ".yaml")
-        backend = dirname(replace(file_path, "rancher_secret_backend_service_account/", ""))
-      })
-      if startswith(file_path, "rancher_secret_backend_service_account/")
-    }
-    rancher_secret_backend_role = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "rancher_secret_backend_role/", ""), ".yaml") => merge(content, {
-        name    = trimsuffix(basename(file_path), ".yaml")
-        backend = dirname(replace(file_path, "rancher_secret_backend_role/", ""))
-      })
-      if startswith(file_path, "rancher_secret_backend_role/")
-    }
-    gitea_secret_backend = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => content
-      if startswith(file_path, "gitea_secret_backend/")
-    }
-    gitea_secret_backend_role = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "gitea_secret_backend_role/", ""), ".yaml") => merge(content, {
-        name    = trimsuffix(basename(file_path), ".yaml")
-        backend = dirname(replace(file_path, "gitea_secret_backend_role/", ""))
-      })
-      if startswith(file_path, "gitea_secret_backend_role/")
-    }
-    netbox_secret_backend = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => content
-      if startswith(file_path, "netbox_secret_backend/")
-    }
-    netbox_secret_backend_role = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "netbox_secret_backend_role/", ""), ".yaml") => merge(content, {
-        name            = trimsuffix(basename(file_path), ".yaml")
-        netbox_username = trimsuffix(basename(file_path), ".yaml")
-        backend         = dirname(replace(file_path, "netbox_secret_backend_role/", ""))
-      })
-      if startswith(file_path, "netbox_secret_backend_role/")
-    }
-    ghp_secret_backend = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => content
-      if startswith(file_path, "ghp_secret_backend/")
-    }
-    ghp_secret_backend_role = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "ghp_secret_backend_role/", ""), ".yaml") => merge(content, {
-        name    = trimsuffix(basename(file_path), ".yaml")
-        backend = dirname(replace(file_path, "ghp_secret_backend_role/", ""))
-      })
-      if startswith(file_path, "ghp_secret_backend_role/")
-    }
   }
 }

config/consul_secret_backend_role/consul_root/au/syd1/terraform-enc.yaml

@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-enc
-ttl: 120
-max_ttl: 300
-datacenters: []

config/consul_secret_backend_role/consul_root/au/syd1/terraform-infra.yaml

@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-infra
-ttl: 120
-max_ttl: 300
-datacenters: []

config/consul_secret_backend_role/consul_root/au/syd1/terraform-rancher.yaml

@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-rancher
-ttl: 120
-max_ttl: 300
-datacenters: []

config/ghp_secret_backend/ghp.yaml

@@ -1,15 +0,0 @@
-# Mounts the ghp token secrets engine at "ghp" and writes its config.
-# The seeded ghp service token is sensitive and read from KV, not stored here:
-#   kv/service/vault/au/syd1/secret_backend/ghp/config
-#   -> key: admin_token (required) the shared ghpsvc_... service token
-#
-# admin_token is a static shared secret provisioned into KV by an operator. The
-# SAME token value must also be present in the running ghp deployment's accepted
-# service tokens (GHP_AUTH_SERVICE_TOKENS) so ghp ACCEPTS what this engine
-# PRESENTS. ghp has no rotate endpoint, so the engine never rotates it in place;
-# the mount uses ignore_changes=[admin_token], making the KV seed create-only
-# (re-reading a stale KV value never re-pushes it to a live mount).
-description: "ghp ephemeral scoped agent token engine"
-base_url: "https://ghp.unkin.net"
-tls_skip_verify: false
-request_timeout_seconds: 30

config/gitea_secret_backend/gitea.yaml

@@ -1,11 +0,0 @@
-# Mounts the gitea token secrets engine at "gitea" and writes its config.
-# The seeded site-admin credentials are sensitive and read from KV, not stored
-# here:
-#   kv/service/vault/au/syd1/secret_backend/gitea/config
-#   -> keys: admin_username (required), admin_password (required)
-# Populate that KV path with a purpose-built Gitea site-admin bot (2FA disabled)
-# BEFORE applying, then run `vault write -f gitea/config/rotate-root` after the
-# first apply so only Vault holds the admin password.
-description: "Gitea ephemeral scoped access token engine"
-gitea_url: "https://git.unkin.net"
-request_timeout_seconds: 30

config/gitea_secret_backend_role/gitea/repospawner.yaml

@@ -1,19 +0,0 @@
-# Role minting ephemeral tokens for the repospawner service user. repospawner
-# creates and seeds Gitea repositories on demand, so it gets write on
-# repositories (create + push) and write on issues (issue/PR comments). Read is
-# implied by write. No admin/org/user-write scopes.
-# read:user is required because most API clients validate the login via
-# GET /api/v1/user, which 403s without it.
-# Reading gitea/creds/repospawner mints a lease-bound token deleted from Gitea
-# on revoke/expiry. Consumed by the repospawner pods via Kubernetes auth (see
-# policies/gitea/creds/repospawner.yaml) -- the agents AppRole is CIDR-bound to
-# Ben's workstation and cannot be used from in-cluster.
----
-username: repospawner
-scopes:
-  - write:repository
-  - write:issue
-  - read:user
-token_name_prefix: vault-repospawner
-ttl: 3600      # 1h
-max_ttl: 14400 # 4h

config/gitea_secret_backend_role/gitea/teabot-implementer.yaml

@@ -1,17 +0,0 @@
-# Role minting ephemeral tokens for the teabot-implementer bot user.
-# The implementer clones/pushes code and opens pull requests, so it gets write
-# on repositories (clone + push + PR create) and write on issues (PR/issue
-# comments). Read is implied by write. No admin/org/user-write scopes.
-# read:user is required because tea (and most API clients) validate the login
-# via GET /api/v1/user, which 403s without it (verified against a minted token).
-# Reading gitea/creds/teabot-implementer mints a lease-bound token deleted from
-# Gitea on revoke/expiry.
----
-username: teabot-implementer
-scopes:
-  - write:repository
-  - write:issue
-  - read:user
-token_name_prefix: vault-teabot-implementer
-ttl: 3600      # 1h
-max_ttl: 14400 # 4h

config/gitea_secret_backend_role/gitea/teabot-reviewer.yaml

@@ -1,17 +0,0 @@
-# Role minting ephemeral tokens for the teabot-reviewer bot user.
-# The reviewer reads code and posts pull-request reviews/comments, so it gets
-# read on repositories (fetch diffs) and write on issues (PR reviews + issue/PR
-# comments). No repository-write, admin, org, or user-write scopes.
-# read:user is required because tea (and most API clients) validate the login
-# via GET /api/v1/user, which 403s without it (verified against a minted token).
-# Reading gitea/creds/teabot-reviewer mints a lease-bound token deleted from
-# Gitea on revoke/expiry.
----
-username: teabot-reviewer
-scopes:
-  - read:repository
-  - write:issue
-  - read:user
-token_name_prefix: vault-teabot-reviewer
-ttl: 3600      # 1h
-max_ttl: 14400 # 4h

config/gitea_secret_backend_role/gitea/unkin-agent.yaml

@@ -1,20 +0,0 @@
-# Role minting ephemeral tokens for the unkin-agent bot user -- the shared
-# identity Ben's AI coding agents use to submit work. The agent clones/pushes
-# code and opens pull requests, so it gets write on repositories (clone + push +
-# PR create) and write on issues (PR/issue comments). Read is implied by write.
-# No admin/org/user-write scopes, so it can never merge via API privilege; merge
-# is blocked separately by branch protection (merge whitelist = Owners).
-# read:user is required because tea (and most API clients) validate the login
-# via GET /api/v1/user, which 403s without it.
-# Reading gitea/creds/unkin-agent mints a lease-bound token deleted from Gitea
-# on revoke/expiry. Consumed by the "agents" AppRole (see
-# policies/gitea/creds/unkin-agent.yaml).
----
-username: unkin-agent
-scopes:
-  - write:repository
-  - write:issue
-  - read:user
-token_name_prefix: vault-unkin-agent
-ttl: 3600      # 1h
-max_ttl: 14400 # 4h

config/gpg_key/gpg/logarchive.yaml

@@ -1,8 +0,0 @@
-# config/gpg_key/gpg/logarchive.yaml
-# OpenPGP key in the gpg engine for the logarchiver service. The private key
-# stays in Vault; logarchiver reads only the exported public key
-# (gpg/keys/logarchive) to encrypt archived logs, and retrieval delegates
-# decryption back to gpg/decrypt/logarchive. Key name = "logarchive", backend = "gpg".
-algorithm: rsa-4096
-identity: "logarchive <logarchive@unkin.net>"
-exportable: false

config/gpg_key/gpg/pass.yaml

@@ -1,7 +0,0 @@
-# config/gpg_key/gpg/pass.yaml
-# An OpenPGP key in the gpg engine for password-store (passv). The private key
-# stays in Vault; clients import the exported public key to encrypt and delegate
-# decryption to gpg/decrypt/pass. Key name = "pass", backend = "gpg".
-algorithm: rsa-4096
-identity: "pass <pass@unkin.net>"
-exportable: false

config/gpg_secret_backend/gpg.yaml

@@ -1,4 +0,0 @@
-# config/gpg_secret_backend/gpg.yaml
-# Mounts the gpg secrets engine at "gpg". The plugin itself is registered in the
-# catalog separately (see config/plugins/vault-plugin-secrets-gpg.yaml).
-description: "GPG/OpenPGP secrets engine (sign/verify/encrypt/decrypt)"

config/kubernetes_secret_backend_role/kubernetes/au/syd1/agent-certs.yaml

@@ -1,4 +0,0 @@
-allowed_kubernetes_namespaces:
-  - "cert-manager"
-kubernetes_role_type: "Role"
-extra_labels: {}

config/kubernetes_secret_backend_role/kubernetes/au/syd1/agent-dhcp.yaml

@@ -1,4 +0,0 @@
-allowed_kubernetes_namespaces:
-  - "dhcp-system"
-kubernetes_role_type: "Role"
-extra_labels: {}

config/kubernetes_secret_backend_role/kubernetes/au/syd1/agent-dns.yaml

@@ -1,4 +0,0 @@
-allowed_kubernetes_namespaces:
-  - "bind-system"
-service_account_name: "agent-dns"
-extra_labels: {}

config/kubernetes_secret_backend_role/kubernetes/au/syd1/agent-storage.yaml

@@ -1,4 +0,0 @@
-allowed_kubernetes_namespaces:
-  - "cephrgw-system"
-kubernetes_role_type: "Role"
-extra_labels: {}

config/litellm_secret_backend/litellm.yaml

@@ -2,5 +2,5 @@
 # The master key is sensitive and read from KV, not stored here:
 #   kv/service/vault/au/syd1/secret_backend/litellm -> key "master_key"
 description: "LiteLLM dynamic virtual keys"
-base_url: "https://litellm.k8s.syd1.au.unkin.net"
+base_url: "http://litellm.litellm.svc:4000"
 request_timeout_seconds: 30

config/litellm_secret_backend_role/litellm/opus47.yaml

@@ -1,9 +0,0 @@
----
-models:
-  - claude-opus-4-7
-max_budget: 5
-ttl: 3600      # seconds (1h)
-max_ttl: 86400 # seconds (24h)
-metadata:
-  team: testuser
-  env: prod

config/netbox_secret_backend/netbox.yaml

@@ -1,48 +0,0 @@
-# Mounts the netbox token secrets engine at "netbox" and writes its config.
-# The seeded NetBox admin token is sensitive and read from KV, not stored here:
-#   kv/service/vault/au/syd1/secret_backend/netbox/config
-#   -> key: admin_token (required) the SINGLE static admin credential
-#
-# admin_token must be a BARE NetBox token with NO scheme prefix: do not prepend
-# "Bearer " or "Token ". NetBox infers the version from the value's nbt_ prefix,
-# so one bare token authenticates under either scheme; the plugin adds the keyword
-# itself. A prefixed value yields a malformed header + 403.
-#
-# Populate admin_token with a purpose-built NetBox superuser token (add_user +
-# add_token + grant_token, or superuser) BEFORE applying, then run
-# `vault write -f netbox/config/rotate` after the first apply so only Vault holds
-# the live admin token.
-#
-# Only ONE static admin token exists. netbox_user_management does NOT re-read this
-# token; instead the engine mints it a short-lived user-admin token per apply from
-# netbox/roles/vault-user-mgmt (see user_mgmt_username below), so rotating
-# admin_token never breaks user management. Set user_mgmt_username to the
-# pre-existing NetBox superuser the static admin_token belongs to (or another
-# superuser). Leaving it unset falls back to using admin_token directly, which is
-# only a bootstrap/degraded path and breaks after rotation.
-#
-# Bootstrap ordering: the vault-user-mgmt role must exist before the netbox
-# provider is configured from its creds, so on a brand-new backend apply the mount
-# + role first (e.g. `tofu apply -target=...netbox_secret_backend
-# -target=...netbox_user_mgmt_role`) once, then apply normally.
-#
-# token_version 2 is the NetBox 4.6.5 default and requires API_TOKEN_PEPPERS to
-# be configured on the NetBox server; set token_version: 1 here if the server
-# has no peppers. token_version does NOT change how the plugin authenticates its
-# own calls (that scheme comes from the admin_token value's nbt_ prefix); it only
-# sets the version of the per-user tokens the engine mints. It must still MATCH
-# the admin_token kind: nbt_ v2 token -> token_version 2; bare v1 token -> 1.
-#
-# The mount uses ignore_changes=[token], so editing KV alone does NOT reach the
-# live mount. To push a corrected/rotated admin token into a running mount:
-#   vault write netbox/config token=<BARE_TOKEN>
-# (netbox_url/token_version are preserved on a partial update). Do NOT -replace
-# the mount to force a re-read - that recreates it and drops all roles/config.
-description: "NetBox ephemeral scoped API token engine"
-netbox_url: "https://netbox.k8s.syd1.au.unkin.net"
-token_version: 2
-request_timeout_seconds: 30
-# Set to the pre-existing NetBox superuser admin_token belongs to, to mint the
-# user-management credential dynamically (recommended). Until set, user management
-# uses admin_token directly and a check block warns that rotation will break it.
-# user_mgmt_username: "vault-netbox-admin"

config/netbox_secret_backend_role/netbox/terraform-infra.yaml

@@ -1,25 +0,0 @@
-# Single declarative source for the terraform-infra NetBox service identity. The
-# filename stem is the engine role name AND the NetBox username (1:1); config.hcl
-# derives both from it, so neither is repeated below. Creating this file creates
-# the user: the netbox_user_management module synthesizes the NetBox user + object
-# permissions from the permissions block, and the engine role mints ephemeral
-# tokens for that same user. write_enabled true because terraform-infra manages
-# NetBox IPAM/DCIM; very short TTLs because a token is minted per plan/apply and
-# revoked when the run's lease ends.
----
-write_enabled: true
-ttl: 120     # 2m
-max_ttl: 300 # 5m
-permissions:
-  - object_types:
-      - ipam.prefix
-      - ipam.ipaddress
-      - ipam.iprange
-      - dcim.device
-      - dcim.interface
-      - dcim.macaddress
-    actions:
-      - view
-      - add
-      - change
-      - delete

config/plugins/vault-plugin-secrets-arrstack.yaml

@@ -1,13 +0,0 @@
-# config/plugins/vault-plugin-secrets-arrstack.yaml
-# Imports (registers) the arrstack secrets plugin in the catalog. Filename =
-# catalog name = mount type. The binary is installed on the OpenBao nodes by
-# Puppet (openbao-plugin-secrets-arrstack RPM ->
-# /opt/openbao-plugins/vault-plugin-secrets-arrstack).
-#
-# sha256 pins the released v0.2.0 binary; bump it in lockstep with any RPM
-# upgrade or OpenBao will refuse to launch the plugin. Registration only
-# succeeds once the Puppet PR has installed the binary on the nodes.
-type: secret
-command: vault-plugin-secrets-arrstack
-version: "0.2.0"
-sha256: "9ea7f16013b3bcbadfcb15b08fd1545f8069893cf864bfdaa57e7e7e72612fa1"

config/plugins/vault-plugin-secrets-ghp.yaml

@@ -1,11 +0,0 @@
-# config/plugins/vault-plugin-secrets-ghp.yaml
-# Imports (registers) the ghp secrets plugin in the catalog. Filename =
-# catalog name = mount type. The binary is installed on the OpenBao nodes by
-# Puppet (openbao-plugin-secrets-ghp RPM ->
-# /opt/openbao-plugins/vault-plugin-secrets-ghp).
-#
-# sha256 pins the released v0.1.0 binary; bump it in lockstep with any RPM
-# upgrade or OpenBao will refuse to launch the plugin.
-type: secret
-command: vault-plugin-secrets-ghp
-sha256: "85761421cd532788ed28fb57e93d3868f3577320a538289936d9ed3be5f396de"

config/plugins/vault-plugin-secrets-gitea.yaml

@@ -1,11 +0,0 @@
-# config/plugins/vault-plugin-secrets-gitea.yaml
-# Imports (registers) the gitea secrets plugin in the catalog. Filename =
-# catalog name = mount type. The binary is installed on the OpenBao nodes by
-# Puppet (openbao-plugin-secrets-gitea RPM ->
-# /opt/openbao-plugins/vault-plugin-secrets-gitea).
-#
-# sha256 pins the released v0.1.0 binary; bump it in lockstep with any RPM
-# upgrade or OpenBao will refuse to launch the plugin.
-type: secret
-command: vault-plugin-secrets-gitea
-sha256: "8f67fbc216effada5fd7399888a710b62fad83be0b31761a439e7dec3d56509b"

config/plugins/vault-plugin-secrets-gpg.yaml

@@ -1,10 +0,0 @@
-# config/plugins/vault-plugin-secrets-gpg.yaml
-# Imports (registers) the gpg secrets plugin in the catalog. Filename = catalog
-# name = mount type. The binary is installed on the OpenBao nodes by Puppet
-# (openbao-plugin-secrets-gpg RPM -> /opt/openbao-plugins/vault-plugin-secrets-gpg).
-#
-# sha256 pins the released v0.1.0 binary; bump it in lockstep with any RPM
-# upgrade or OpenBao will refuse to launch the plugin.
-type: secret
-command: vault-plugin-secrets-gpg
-sha256: "0e92d7408795688badb55789bc1604e8f1dd4d71998656c7f831991fce9a7b20"

config/plugins/vault-plugin-secrets-litellm.yaml

@@ -1,13 +0,0 @@
-# config/plugins/vault-plugin-secrets-litellm.yaml
-# Imports (registers) the litellm secrets plugin in the catalog. This plugin was
-# registered manually before terraform managed the catalog, so its state must be
-# imported before the first apply (see the PR description) — otherwise apply
-# tries to create an entry that already exists.
-#
-# sha256 is the released v0.1.1 openbao binary
-# (openbao-plugin-secrets-litellm RPM -> /opt/openbao-plugins/vault-plugin-secrets-litellm),
-# which Puppet installs floating. Verify against the live catalog during import
-# (`bao read sys/plugins/catalog/secret/vault-plugin-secrets-litellm`).
-type: secret
-command: vault-plugin-secrets-litellm
-sha256: "2263ebcb3498877a87ddcf31a9cbc6efca6b81702a5faecf7fe7e40200ca7a1f"

config/plugins/vault-plugin-secrets-netbox.yaml

@@ -1,11 +0,0 @@
-# config/plugins/vault-plugin-secrets-netbox.yaml
-# Imports (registers) the netbox secrets plugin in the catalog. Filename =
-# catalog name = mount type. The binary is installed on the OpenBao nodes by
-# Puppet (openbao-plugin-secrets-netbox RPM ->
-# /opt/openbao-plugins/vault-plugin-secrets-netbox).
-#
-# sha256 pins the released v0.1.0 binary; bump it in lockstep with any RPM
-# upgrade or OpenBao will refuse to launch the plugin.
-type: secret
-command: vault-plugin-secrets-netbox
-sha256: "362b7f6c9e21179ad51d2d810684d9387fe50e3a1887f171700122a0b2a05cef"

config/plugins/vault-plugin-secrets-rancher.yaml

@@ -1,11 +0,0 @@
-# config/plugins/vault-plugin-secrets-rancher.yaml
-# Imports (registers) the rancher secrets plugin in the catalog. Filename =
-# catalog name = mount type. The binary is installed on the OpenBao nodes by
-# Puppet (openbao-plugin-secrets-rancher RPM ->
-# /opt/openbao-plugins/vault-plugin-secrets-rancher).
-#
-# sha256 pins the released v0.1.1 binary; bump it in lockstep with any RPM
-# upgrade or OpenBao will refuse to launch the plugin.
-type: secret
-command: vault-plugin-secrets-rancher
-sha256: "9e597cd9512a0629f940141dc6611bf95eaf165abcb52470eee027bf467d5955"

config/rancher_secret_backend/rancher.yaml

@@ -1,8 +0,0 @@
-# Mounts the rancher token secrets engine at "rancher" and writes its config.
-# The plugin is registered in the catalog separately (see
-# config/plugins/vault-plugin-secrets-rancher.yaml). Seeded service-account
-# tokens live under config/rancher_secret_backend_service_account/rancher/ and
-# roles under config/rancher_secret_backend_role/rancher/.
-description: "Rancher API token engine (seeded root rotation + dynamic scoped creds)"
-rancher_url: "https://rancher.k8s.syd1.au.unkin.net"
-request_timeout_seconds: 30

config/rancher_secret_backend_role/rancher/ci.yaml

@@ -1,9 +0,0 @@
-# A role that mints short-lived Rancher tokens from the "admin" service account.
-# Reading rancher/creds/ci returns a lease-bound token deleted from Rancher on
-# revoke. Minted tokens inherit the admin service account's RBAC; only cluster
-# and TTL are scoped per-token.
----
-service_account: admin
-description: "CI/CD ephemeral Rancher token"
-ttl: 3600      # seconds (1h)
-max_ttl: 28800 # seconds (8h)

config/rancher_secret_backend_service_account/rancher/admin.yaml

@@ -1,8 +0,0 @@
-# A seeded, auto-rotated Rancher service-account token on the "rancher" engine.
-# The seed token itself is sensitive and read from KV (not stored here):
-#   kv/service/vault/au/syd1/secret_backend/rancher/service_account/admin
-#   -> keys: token (required), token_name (optional)
-# Populate that KV path with a live Rancher admin token BEFORE applying; the
-# engine then rotates it (mints a fresh 90d token every 45d) so it never lapses.
-token_ttl: 7776000       # 90d in seconds
-rotation_period: 3888000 # 45d in seconds

environments/au/syd1/terragrunt.hcl

@@ -39,12 +39,6 @@ locals {
     for backend_name, _ in local.config.consul_secret_backend :
     backend_name => replace(backend_name, "/", "_")
   }
-
-  # Same sanitized alias mapping for the NetBox providers.
-  netbox_backend_aliases = {
-    for backend_name, _ in local.config.netbox_secret_backend :
-    backend_name => replace(backend_name, "/", "_")
-  }
 }
 
 terraform {
@@ -60,9 +54,6 @@ inputs = {
   auth_approle_role              = local.config.auth_approle_role
   auth_ldap_backend              = local.config.auth_ldap_backend
   auth_ldap_group                = local.config.auth_ldap_group
-  auth_oidc_backend              = local.config.auth_oidc_backend
-  auth_oidc_role                 = local.config.auth_oidc_role
-  auth_oidc_group                = local.config.auth_oidc_group
   auth_kubernetes_backend        = local.config.auth_kubernetes_backend
   auth_kubernetes_role           = local.config.auth_kubernetes_role
   kv_secret_backend              = local.config.kv_secret_backend
@@ -79,24 +70,6 @@ inputs = {
   pki_mount_only                 = local.config.pki_mount_only
   litellm_secret_backend         = local.config.litellm_secret_backend
   litellm_secret_backend_role    = local.config.litellm_secret_backend_role
-  arrstack_secret_backend        = local.config.arrstack_secret_backend
-  arrstack_secret_backend_role   = local.config.arrstack_secret_backend_role
-  plugins                        = local.config.plugins
-  gpg_secret_backend             = local.config.gpg_secret_backend
-  gpg_key                        = local.config.gpg_key
-
-  rancher_secret_backend                 = local.config.rancher_secret_backend
-  rancher_secret_backend_service_account = local.config.rancher_secret_backend_service_account
-  rancher_secret_backend_role            = local.config.rancher_secret_backend_role
-
-  gitea_secret_backend      = local.config.gitea_secret_backend
-  gitea_secret_backend_role = local.config.gitea_secret_backend_role
-
-  netbox_secret_backend      = local.config.netbox_secret_backend
-  netbox_secret_backend_role = local.config.netbox_secret_backend_role
-
-  ghp_secret_backend      = local.config.ghp_secret_backend
-  ghp_secret_backend_role = local.config.ghp_secret_backend_role
 
   # Pass policy maps to vault_cluster module
   policy_auth_map  = local.policies.policy_auth_map
@@ -104,7 +77,4 @@ inputs = {
 
   # Pass sanitized consul backend aliases for provider configuration
   consul_backend_aliases = local.consul_backend_aliases
-
-  # Pass sanitized netbox backend aliases for provider configuration
-  netbox_backend_aliases = local.netbox_backend_aliases
 }

environments/root.hcl

@@ -17,24 +17,6 @@ provider "litellm" {
   address = local.vault_addr
 }
 
-# The gpg secrets engine's keys are managed through its own provider (same Vault
-# server; token falls back to VAULT_TOKEN).
-provider "gpg" {
-  address = local.vault_addr
-}
-
-# The rancher token secrets engine is managed through its own provider (same
-# Vault server; token falls back to VAULT_TOKEN).
-provider "rancher" {
-  address = local.vault_addr
-}
-
-# The arrstack (arrproxy API key) secrets engine is managed through its own
-# provider (same Vault server; token falls back to VAULT_TOKEN).
-provider "arrstack" {
-  address = local.vault_addr
-}
-
 terraform {
   backend "consul" {
     address = "https://consul.service.consul"
@@ -57,18 +39,6 @@ terraform {
       source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/litellmvaultsecret"
       version = "0.1.0"
     }
-    gpg = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/gpgvaultsecret"
-      version = "0.1.0"
-    }
-    rancher = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/ranchervaultsecret"
-      version = "0.1.0"
-    }
-    arrstack = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/vault-secrets-arrstack"
-      version = "0.2.0"
-    }
   }
 }
 EOF

modules/vault_cluster/main.tf

@@ -64,55 +64,6 @@ module "auth_ldap_group" {
   depends_on = [module.auth_ldap_backend]
 }
 
-module "auth_oidc_backend" {
-  source = "./modules/auth_oidc_backend"
-
-  for_each = var.auth_oidc_backend
-
-  path                = each.key
-  description         = each.value.description
-  oidc_discovery_url  = each.value.oidc_discovery_url
-  client_secret_mount = each.value.client_secret_mount
-  client_secret_path  = each.value.client_secret_path
-  default_role        = each.value.default_role
-  listing_visibility  = each.value.listing_visibility
-  default_lease_ttl   = each.value.default_lease_ttl
-  max_lease_ttl       = each.value.max_lease_ttl
-}
-
-module "auth_oidc_role" {
-  source = "./modules/auth_oidc_role"
-
-  for_each = var.auth_oidc_role
-
-  backend               = each.value.backend
-  role_name             = each.value.role_name
-  user_claim            = each.value.user_claim
-  groups_claim          = each.value.groups_claim
-  oidc_scopes           = each.value.oidc_scopes
-  bound_audiences       = each.value.bound_audiences
-  allowed_redirect_uris = each.value.allowed_redirect_uris
-  token_ttl             = each.value.token_ttl
-  token_max_ttl         = each.value.token_max_ttl
-  # Human authorization comes from the external identity groups below, so a
-  # login role carrying no policies is the normal case.
-  token_policies = try(var.policy_auth_map[each.value.backend][each.value.role_name], [])
-
-  depends_on = [module.auth_oidc_backend]
-}
-
-module "auth_oidc_group" {
-  source = "./modules/auth_oidc_group"
-
-  for_each = var.auth_oidc_group
-
-  groupname      = each.value.groupname
-  policies       = var.policy_auth_map[each.value.backend][each.value.groupname]
-  mount_accessor = module.auth_oidc_backend[each.value.backend].accessor
-
-  depends_on = [module.auth_oidc_backend]
-}
-
 module "auth_kubernetes_backend" {
   source = "./modules/auth_kubernetes_backend"
 
@@ -348,7 +299,6 @@ module "kubernetes_secret_backend_role" {
   allowed_kubernetes_namespaces = each.value.allowed_kubernetes_namespaces
   kubernetes_role_type          = each.value.kubernetes_role_type
   extra_labels                  = each.value.extra_labels
-  service_account_name          = each.value.service_account_name
 
   depends_on = [module.kubernetes_secret_backend]
 }
@@ -384,274 +334,6 @@ module "litellm_secret_backend_role" {
   depends_on = [module.litellm_secret_backend]
 }
 
-module "plugin" {
-  source = "./modules/plugin"
-
-  for_each = var.plugins
-
-  name           = each.value.name
-  type           = each.value.type
-  command        = each.value.command
-  sha256         = each.value.sha256
-  plugin_version = each.value.version
-}
-
-module "arrstack_secret_backend" {
-  source = "./modules/arrstack_secret_backend"
-
-  for_each = var.arrstack_secret_backend
-
-  path                    = each.key
-  plugin                  = each.value.plugin
-  description             = each.value.description
-  base_url                = each.value.base_url
-  ca_cert                 = each.value.ca_cert
-  request_timeout_seconds = each.value.request_timeout_seconds
-
-  depends_on = [module.plugin]
-}
-
-module "arrstack_secret_backend_role" {
-  source = "./modules/arrstack_secret_backend_role"
-
-  for_each = var.arrstack_secret_backend_role
-
-  name    = each.value.name
-  backend = each.value.backend
-  apps    = each.value.apps
-  methods = each.value.methods
-  ttl     = each.value.ttl
-  max_ttl = each.value.max_ttl
-
-  depends_on = [module.arrstack_secret_backend]
-}
-
-module "gpg_secret_backend" {
-  source = "./modules/gpg_secret_backend"
-
-  for_each = var.gpg_secret_backend
-
-  path        = each.key
-  plugin      = each.value.plugin
-  description = each.value.description
-
-  depends_on = [module.plugin]
-}
-
-module "gpg_key" {
-  source = "./modules/gpg_key"
-
-  for_each = var.gpg_key
-
-  backend                = each.value.backend
-  name                   = each.value.name
-  algorithm              = each.value.algorithm
-  identity               = each.value.identity
-  exportable             = each.value.exportable
-  deletion_allowed       = each.value.deletion_allowed
-  min_decryption_version = each.value.min_decryption_version
-
-  depends_on = [module.gpg_secret_backend]
-}
-
-module "rancher_secret_backend" {
-  source = "./modules/rancher_secret_backend"
-
-  for_each = var.rancher_secret_backend
-
-  path                    = each.key
-  plugin                  = each.value.plugin
-  description             = each.value.description
-  rancher_url             = each.value.rancher_url
-  ca_cert                 = each.value.ca_cert
-  tls_skip_verify         = each.value.tls_skip_verify
-  request_timeout_seconds = each.value.request_timeout_seconds
-
-  depends_on = [module.plugin]
-}
-
-module "rancher_secret_backend_service_account" {
-  source = "./modules/rancher_secret_backend_service_account"
-
-  for_each = var.rancher_secret_backend_service_account
-
-  backend         = each.value.backend
-  name            = each.value.name
-  country         = var.country
-  region          = var.region
-  token_ttl       = each.value.token_ttl
-  rotation_period = each.value.rotation_period
-
-  depends_on = [module.rancher_secret_backend]
-}
-
-module "rancher_secret_backend_role" {
-  source = "./modules/rancher_secret_backend_role"
-
-  for_each = var.rancher_secret_backend_role
-
-  backend         = each.value.backend
-  name            = each.value.name
-  service_account = each.value.service_account
-  cluster_name    = each.value.cluster_name
-  description     = each.value.description
-  ttl             = each.value.ttl
-  max_ttl         = each.value.max_ttl
-
-  depends_on = [module.rancher_secret_backend_service_account]
-}
-
-module "gitea_secret_backend" {
-  source = "./modules/gitea_secret_backend"
-
-  for_each = var.gitea_secret_backend
-
-  path                    = each.key
-  plugin                  = each.value.plugin
-  description             = each.value.description
-  gitea_url               = each.value.gitea_url
-  country                 = var.country
-  region                  = var.region
-  ca_cert                 = each.value.ca_cert
-  tls_skip_verify         = each.value.tls_skip_verify
-  request_timeout_seconds = each.value.request_timeout_seconds
-
-  depends_on = [module.plugin]
-}
-
-module "gitea_secret_backend_role" {
-  source = "./modules/gitea_secret_backend_role"
-
-  for_each = var.gitea_secret_backend_role
-
-  backend           = each.value.backend
-  name              = each.value.name
-  username          = each.value.username
-  scopes            = each.value.scopes
-  token_name_prefix = each.value.token_name_prefix
-  ttl               = each.value.ttl
-  max_ttl           = each.value.max_ttl
-
-  depends_on = [module.gitea_secret_backend]
-}
-
-module "netbox_secret_backend" {
-  source = "./modules/netbox_secret_backend"
-
-  for_each = var.netbox_secret_backend
-
-  path                    = each.key
-  plugin                  = each.value.plugin
-  description             = each.value.description
-  netbox_url              = each.value.netbox_url
-  token_version           = each.value.token_version
-  country                 = var.country
-  region                  = var.region
-  ca_cert                 = each.value.ca_cert
-  tls_skip_verify         = each.value.tls_skip_verify
-  request_timeout_seconds = each.value.request_timeout_seconds
-
-  depends_on = [module.plugin]
-}
-
-# Dedicated engine role that mints an ephemeral, user-admin-capable token for the
-# pre-existing NetBox superuser named on each backend (user_mgmt_username).
-# netbox_user_management reads netbox/creds/vault-user-mgmt from it, so it
-# authenticates with a short-lived Vault-minted token derived from the single
-# static admin token - never a second static credential, and unaffected by
-# rotation of the engine's admin seed. Created before user management so the role
-# exists when it reads creds.
-module "netbox_user_mgmt_role" {
-  source = "./modules/netbox_secret_backend_role"
-
-  for_each = { for k, v in var.netbox_secret_backend : k => v if v.user_mgmt_username != null }
-
-  backend         = each.key
-  name            = "vault-user-mgmt"
-  netbox_username = each.value.user_mgmt_username
-  write_enabled   = true
-  description     = "Ephemeral user-admin token for netbox_user_management (Vault-minted per apply)"
-  ttl             = 600
-  max_ttl         = 1200
-
-  depends_on = [module.netbox_secret_backend]
-}
-
-# Declaratively manage the NetBox service users + object permissions the engine
-# roles mint tokens for, authenticating with the Vault-minted user-admin token
-# above (mirrors consul_acl_management). Consumes the SAME role config as
-# netbox_secret_backend_role: one file per identity, filename-derived username,
-# inline permissions.
-module "netbox_user_management" {
-  source = "./modules/netbox_user_management"
-
-  country                = var.country
-  region                 = var.region
-  netbox_backends        = var.netbox_secret_backend
-  netbox_roles           = var.netbox_secret_backend_role
-  netbox_backend_aliases = var.netbox_backend_aliases
-
-  # This module declares its own netbox provider, so it is a legacy module and
-  # cannot take depends_on. Ordering vs the vault-user-mgmt role is not needed on
-  # steady state (the role pre-exists, so reading its creds succeeds regardless);
-  # on first enablement the role must be created first via the one-time targeted
-  # bootstrap documented in config/netbox_secret_backend/netbox.yaml.
-}
-
-module "netbox_secret_backend_role" {
-  source = "./modules/netbox_secret_backend_role"
-
-  for_each = var.netbox_secret_backend_role
-
-  backend         = each.value.backend
-  name            = each.value.name
-  netbox_username = each.value.netbox_username
-  netbox_user_id  = each.value.netbox_user_id
-  write_enabled   = each.value.write_enabled
-  description     = each.value.description
-  ttl             = each.value.ttl
-  max_ttl         = each.value.max_ttl
-
-  depends_on = [module.netbox_secret_backend, module.netbox_user_management]
-}
-
-module "ghp_secret_backend" {
-  source = "./modules/ghp_secret_backend"
-
-  for_each = var.ghp_secret_backend
-
-  path                    = each.key
-  plugin                  = each.value.plugin
-  description             = each.value.description
-  base_url                = each.value.base_url
-  country                 = var.country
-  region                  = var.region
-  ca_cert                 = each.value.ca_cert
-  tls_skip_verify         = each.value.tls_skip_verify
-  request_timeout_seconds = each.value.request_timeout_seconds
-
-  depends_on = [module.plugin]
-}
-
-module "ghp_secret_backend_role" {
-  source = "./modules/ghp_secret_backend_role"
-
-  for_each = var.ghp_secret_backend_role
-
-  backend         = each.value.backend
-  name            = each.value.name
-  token_type      = each.value.token_type
-  installation_id = each.value.installation_id
-  app_record_id   = each.value.app_record_id
-  repositories    = each.value.repositories
-  scopes          = each.value.scopes
-  session_prefix  = each.value.session_prefix
-  ttl             = each.value.ttl
-  max_ttl         = each.value.max_ttl
-
-  depends_on = [module.ghp_secret_backend]
-}
-
 module "vault_policy" {
   source = "./modules/vault_policy"
 

modules/vault_cluster/modules/arrstack_secret_backend/main.tf

@@ -1,20 +0,0 @@
-# Mounts the arrstack dynamic secrets engine and writes its config via the
-# vault-secrets-arrstack provider. The plugin is registered in the catalog
-# separately (config/plugins/vault-plugin-secrets-arrstack.yaml). The arrproxy
-# admin token is sensitive and read from KV, not stored in git:
-#   kv/kubernetes/namespace/arrstack/default/arrproxy-admin-token -> key "token"
-# (seeded by argocd-apps #384).
-data "vault_kv_secret_v2" "admin_token" {
-  mount = "kv"
-  name  = var.admin_token_kv_name
-}
-
-resource "arrstack_secret_backend" "this" {
-  path                    = var.path
-  plugin                  = var.plugin
-  description             = var.description
-  base_url                = var.base_url
-  admin_token             = data.vault_kv_secret_v2.admin_token.data[var.admin_token_kv_key]
-  ca_cert                 = var.ca_cert
-  request_timeout_seconds = var.request_timeout_seconds
-}

modules/vault_cluster/modules/arrstack_secret_backend/terraform.tf

@@ -1,13 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-    arrstack = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/vault-secrets-arrstack"
-      version = "0.2.0"
-    }
-  }
-}

modules/vault_cluster/modules/arrstack_secret_backend/variables.tf

@@ -1,45 +0,0 @@
-variable "path" {
-  description = "Mount path of the arrstack secrets engine (e.g. \"arrstack\")"
-  type        = string
-}
-
-variable "plugin" {
-  description = "Registered plugin name/type to mount (the catalog name = mount type)"
-  type        = string
-  default     = "vault-plugin-secrets-arrstack"
-}
-
-variable "description" {
-  description = "Human-friendly description of the mount"
-  type        = string
-  default     = null
-}
-
-variable "base_url" {
-  description = "Base URL of the arrproxy front door (e.g. https://arrstack.unkin.net)"
-  type        = string
-}
-
-variable "admin_token_kv_name" {
-  description = "kv-v2 secret name (relative to the \"kv\" mount) holding the seeded arrproxy admin token"
-  type        = string
-  default     = "kubernetes/namespace/arrstack/default/arrproxy-admin-token"
-}
-
-variable "admin_token_kv_key" {
-  description = "Key within the KV secret that holds the arrproxy admin token"
-  type        = string
-  default     = "token"
-}
-
-variable "ca_cert" {
-  description = "PEM CA certificate that signed the arrproxy server's TLS cert (optional; omit to use the system trust store)"
-  type        = string
-  default     = null
-}
-
-variable "request_timeout_seconds" {
-  description = "HTTP timeout in seconds for calls from the plugin to arrproxy"
-  type        = number
-  default     = 30
-}

modules/vault_cluster/modules/arrstack_secret_backend_role/main.tf

@@ -1,8 +0,0 @@
-resource "arrstack_secret_backend_role" "this" {
-  backend = var.backend
-  name    = var.name
-  apps    = var.apps
-  methods = var.methods
-  ttl     = var.ttl
-  max_ttl = var.max_ttl
-}

modules/vault_cluster/modules/arrstack_secret_backend_role/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    arrstack = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/vault-secrets-arrstack"
-      version = "0.2.0"
-    }
-  }
-}

modules/vault_cluster/modules/arrstack_secret_backend_role/variables.tf

@@ -1,33 +0,0 @@
-variable "name" {
-  description = "Name of the role"
-  type        = string
-}
-
-variable "backend" {
-  description = "Mount path of the arrstack secrets engine this role belongs to"
-  type        = string
-}
-
-variable "apps" {
-  description = "arr apps a generated key may access (subset of sonarr, radarr, prowlarr)"
-  type        = list(string)
-}
-
-variable "methods" {
-  description = "HTTP methods a generated key is limited to (subset of GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS). Null leaves the role unrestricted"
-  type        = set(string)
-  # null, not [], so a role yaml that omits methods matches the provider's null read-back and shows no drift.
-  default = null
-}
-
-variable "ttl" {
-  description = "Default lease TTL in seconds for keys generated from this role"
-  type        = number
-  default     = null
-}
-
-variable "max_ttl" {
-  description = "Maximum lease TTL in seconds for keys generated from this role"
-  type        = number
-  default     = null
-}

modules/vault_cluster/modules/auth_oidc_backend/main.tf

@@ -1,22 +0,0 @@
-# Expected keys in KV secret: client_id, client_secret (generated and written by
-# terraform-authentik's oauth2 provider module, never seeded by hand).
-data "vault_kv_secret_v2" "oidc_client" {
-  mount = var.client_secret_mount
-  name  = var.client_secret_path
-}
-
-resource "vault_jwt_auth_backend" "oidc" {
-  path               = var.path
-  type               = "oidc"
-  description        = var.description
-  oidc_discovery_url = var.oidc_discovery_url
-  oidc_client_id     = data.vault_kv_secret_v2.oidc_client.data["client_id"]
-  oidc_client_secret = data.vault_kv_secret_v2.oidc_client.data["client_secret"]
-  default_role       = var.default_role
-
-  tune {
-    default_lease_ttl  = var.default_lease_ttl
-    max_lease_ttl      = var.max_lease_ttl
-    listing_visibility = var.listing_visibility
-  }
-}

modules/vault_cluster/modules/auth_oidc_backend/outputs.tf

@@ -1,9 +0,0 @@
-output "accessor" {
-  description = "Accessor of the OIDC auth mount, used to bind identity group aliases"
-  value       = vault_jwt_auth_backend.oidc.accessor
-}
-
-output "path" {
-  description = "Mount path of the OIDC auth backend"
-  value       = vault_jwt_auth_backend.oidc.path
-}

modules/vault_cluster/modules/auth_oidc_backend/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-  }
-}

modules/vault_cluster/modules/auth_oidc_backend/variables.tf

@@ -1,56 +0,0 @@
-variable "path" {
-  description = "Mount path of the OIDC auth backend"
-  type        = string
-  default     = "oidc"
-}
-
-variable "description" {
-  description = "Human-readable description of the auth mount"
-  type        = string
-  default     = null
-}
-
-variable "oidc_discovery_url" {
-  description = "OIDC issuer discovery URL of the identity provider"
-  type        = string
-}
-
-variable "client_secret_mount" {
-  description = "KV-v2 mount holding the OIDC client credentials"
-  type        = string
-  default     = "kv"
-}
-
-variable "client_secret_path" {
-  description = "Path within the KV-v2 mount holding client_id and client_secret"
-  type        = string
-  default     = "service/authentik/oidc-vault"
-}
-
-variable "default_role" {
-  description = "Role used when none is supplied at login (the UI/CLI default)"
-  type        = string
-  default     = "default"
-}
-
-variable "listing_visibility" {
-  description = "Specifies whether to show this mount in the UI-specific listing endpoint. Valid values are 'unauth' or 'hidden'"
-  type        = string
-  default     = null
-  validation {
-    condition     = var.listing_visibility == null || contains(["unauth", "hidden"], var.listing_visibility)
-    error_message = "listing_visibility must be either 'unauth' or 'hidden'."
-  }
-}
-
-variable "default_lease_ttl" {
-  description = "Specifies the default time-to-live. If set, this overrides the global default. Must be a valid duration string"
-  type        = string
-  default     = null
-}
-
-variable "max_lease_ttl" {
-  description = "Specifies the maximum time-to-live. If set, this overrides the global default. Must be a valid duration string"
-  type        = string
-  default     = null
-}

modules/vault_cluster/modules/auth_oidc_group/main.tf

@@ -1,13 +0,0 @@
-# External identity group: membership is asserted by the IdP through the role's
-# groups_claim, matched by the alias name below.
-resource "vault_identity_group" "group" {
-  name     = var.groupname
-  type     = "external"
-  policies = var.policies
-}
-
-resource "vault_identity_group_alias" "alias" {
-  name           = var.groupname
-  mount_accessor = var.mount_accessor
-  canonical_id   = vault_identity_group.group.id
-}

modules/vault_cluster/modules/auth_oidc_group/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-  }
-}

modules/vault_cluster/modules/auth_oidc_group/variables.tf

@@ -1,14 +0,0 @@
-variable "groupname" {
-  description = "Name of the IdP group, as it appears in the groups claim"
-  type        = string
-}
-
-variable "policies" {
-  description = "List of policies to assign to the identity group"
-  type        = list(string)
-}
-
-variable "mount_accessor" {
-  description = "Accessor of the OIDC auth mount the alias is bound to"
-  type        = string
-}

modules/vault_cluster/modules/auth_oidc_role/main.tf

@@ -1,13 +0,0 @@
-resource "vault_jwt_auth_backend_role" "role" {
-  backend               = var.backend
-  role_name             = var.role_name
-  role_type             = "oidc"
-  user_claim            = var.user_claim
-  groups_claim          = var.groups_claim
-  oidc_scopes           = var.oidc_scopes
-  bound_audiences       = var.bound_audiences
-  allowed_redirect_uris = var.allowed_redirect_uris
-  token_ttl             = var.token_ttl
-  token_max_ttl         = var.token_max_ttl
-  token_policies        = var.token_policies
-}

modules/vault_cluster/modules/auth_oidc_role/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-  }
-}

modules/vault_cluster/modules/auth_oidc_role/variables.tf

@@ -1,56 +0,0 @@
-variable "backend" {
-  description = "The unique path of the OIDC auth backend to configure"
-  type        = string
-}
-
-variable "role_name" {
-  description = "The name of the role"
-  type        = string
-}
-
-variable "user_claim" {
-  description = "Claim used as the entity alias name (the Vault identity of the human)"
-  type        = string
-  default     = "email"
-}
-
-variable "groups_claim" {
-  description = "Claim holding the caller's group memberships, matched against identity group aliases"
-  type        = string
-  default     = "ak_groups"
-}
-
-variable "oidc_scopes" {
-  description = "Scopes requested from the identity provider during the authorization request"
-  type        = list(string)
-  default     = []
-}
-
-variable "bound_audiences" {
-  description = "List of audiences (aud claim) accepted in the ID token"
-  type        = list(string)
-  default     = []
-}
-
-variable "allowed_redirect_uris" {
-  description = "Redirect URIs accepted for this role. Must match the provider's registered URIs exactly"
-  type        = list(string)
-}
-
-variable "token_ttl" {
-  description = "The TTL period of tokens issued using this role, in seconds"
-  type        = number
-  default     = 3600
-}
-
-variable "token_max_ttl" {
-  description = "The maximum lifetime for generated tokens in number of seconds. Its current value will be referenced at renewal time."
-  type        = number
-  default     = 28800
-}
-
-variable "token_policies" {
-  description = "List of policies to assign to the role (passed from policy_auth_map). Human authorization normally comes from external identity groups instead"
-  type        = list(string)
-  default     = []
-}

modules/vault_cluster/modules/ghp_secret_backend/main.tf

@@ -1,31 +0,0 @@
-# Mounts the ghp secrets engine and writes its connection config via the
-# vault-secrets-ghp provider. The plugin is registered ("imported") in the
-# catalog separately (config/plugins/vault-plugin-secrets-ghp.yaml). The seeded
-# ghp service token is sensitive and read from KV, not stored in git:
-#   kv/service/vault/<country>/<region>/secret_backend/<path>/config
-# Expected key: admin_token (a ghpsvc_... service token that ghp accepts via its
-# GHP_AUTH_SERVICE_TOKENS list). ghp has no rotate endpoint, so this static
-# shared secret is the single credential the engine authenticates with.
-data "vault_kv_secret_v2" "config" {
-  mount = "kv"
-  name  = "service/vault/${var.country}/${var.region}/secret_backend/${var.path}/config"
-}
-
-resource "ghp_secret_backend" "this" {
-  path                    = var.path
-  plugin                  = var.plugin
-  description             = var.description
-  base_url                = var.base_url
-  admin_token             = data.vault_kv_secret_v2.config.data["admin_token"]
-  ca_cert                 = var.ca_cert
-  tls_skip_verify         = var.tls_skip_verify
-  request_timeout_seconds = var.request_timeout_seconds
-
-  lifecycle {
-    # The KV seed is a bootstrap credential consumed only when the engine config
-    # is first created. ghp has no rotate endpoint, so re-reading a (possibly
-    # stale) KV value must never re-push it into the live mount. Ignoring the
-    # token makes this module create-only for it (mirrors gitea/netbox config).
-    ignore_changes = [admin_token]
-  }
-}

modules/vault_cluster/modules/ghp_secret_backend/terraform.tf

@@ -1,13 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-    ghp = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/vault-secrets-ghp"
-      version = "0.1.0"
-    }
-  }
-}

modules/vault_cluster/modules/ghp_secret_backend/variables.tf

@@ -1,49 +0,0 @@
-variable "path" {
-  description = "Mount path of the ghp secrets engine (e.g. \"ghp\")"
-  type        = string
-}
-
-variable "plugin" {
-  description = "Registered plugin name to mount (the catalog name = mount type)"
-  type        = string
-  default     = "vault-plugin-secrets-ghp"
-}
-
-variable "description" {
-  description = "Human-friendly description of the mount"
-  type        = string
-  default     = null
-}
-
-variable "base_url" {
-  description = "Base URL of the ghp server (e.g. https://ghp.unkin.net)"
-  type        = string
-}
-
-variable "country" {
-  description = "Country segment of the KV path holding the seeded admin token"
-  type        = string
-}
-
-variable "region" {
-  description = "Region segment of the KV path holding the seeded admin token"
-  type        = string
-}
-
-variable "ca_cert" {
-  description = "PEM CA certificate that signed the ghp server's TLS cert (optional; omit to use the system trust store)"
-  type        = string
-  default     = null
-}
-
-variable "tls_skip_verify" {
-  description = "Skip TLS verification of the ghp server (not recommended)"
-  type        = bool
-  default     = false
-}
-
-variable "request_timeout_seconds" {
-  description = "HTTP timeout in seconds for calls from the plugin to ghp"
-  type        = number
-  default     = 30
-}

modules/vault_cluster/modules/ghp_secret_backend_role/main.tf

@@ -1,15 +0,0 @@
-# A role that mints short-lived, scoped ghp tokens. Reading ghp/creds/<name>
-# produces a lease-bound token that is revoked from ghp when the lease is
-# revoked or reaches max_ttl.
-resource "ghp_secret_role" "this" {
-  backend         = var.backend
-  name            = var.name
-  token_type      = var.token_type
-  installation_id = var.installation_id
-  app_record_id   = var.app_record_id
-  repositories    = var.repositories
-  scopes          = var.scopes
-  session_prefix  = var.session_prefix
-  ttl             = var.ttl
-  max_ttl         = var.max_ttl
-}

modules/vault_cluster/modules/ghp_secret_backend_role/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    ghp = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/vault-secrets-ghp"
-      version = "0.1.0"
-    }
-  }
-}

modules/vault_cluster/modules/ghp_secret_backend_role/variables.tf

@@ -1,57 +0,0 @@
-variable "backend" {
-  description = "Mount path of the ghp secrets engine this role belongs to"
-  type        = string
-}
-
-variable "name" {
-  description = "Role name (read ghp/creds/<name> to mint a token)"
-  type        = string
-}
-
-variable "token_type" {
-  description = "ghp token type to mint: \"agent\" (default) or \"proxy\""
-  type        = string
-  default     = null
-}
-
-variable "installation_id" {
-  description = "ghp App installation id the minted agent token is bound to (required when token_type is \"agent\")"
-  type        = number
-  default     = null
-}
-
-variable "app_record_id" {
-  description = "Optional ghp App record id (UUID) to pin agent tokens to; empty selects ghp's default app"
-  type        = string
-  default     = null
-}
-
-variable "repositories" {
-  description = "Optional repositories the minted token is restricted to; empty is open-scoped (all repositories)"
-  type        = list(string)
-  default     = null
-}
-
-variable "scopes" {
-  description = "Optional ghp permission:level scopes (e.g. [\"contents:read\"]); empty is open-scoped"
-  type        = list(string)
-  default     = null
-}
-
-variable "session_prefix" {
-  description = "Prefix for the ghp session id of each minted token (default \"vault\")"
-  type        = string
-  default     = null
-}
-
-variable "ttl" {
-  description = "Default lease TTL in seconds for minted tokens"
-  type        = number
-  default     = null
-}
-
-variable "max_ttl" {
-  description = "Maximum lease TTL in seconds for minted tokens"
-  type        = number
-  default     = null
-}

modules/vault_cluster/modules/gitea_secret_backend/main.tf

@@ -1,34 +0,0 @@
-# Mounts the gitea secrets engine and writes its connection config via the
-# giteavaultsecret provider. The plugin is registered ("imported") in the
-# catalog separately (config/plugins/vault-plugin-secrets-gitea.yaml). The
-# seeded site-admin credentials are sensitive and read from KV, not stored in
-# git:
-#   kv/service/vault/<country>/<region>/secret_backend/<path>/config
-# Expected keys: admin_username (required), admin_password (required).
-data "vault_kv_secret_v2" "config" {
-  mount = "kv"
-  name  = "service/vault/${var.country}/${var.region}/secret_backend/${var.path}/config"
-}
-
-resource "gitea_secret_backend" "this" {
-  path                    = var.path
-  plugin                  = var.plugin
-  description             = var.description
-  gitea_url               = var.gitea_url
-  admin_username          = data.vault_kv_secret_v2.config.data["admin_username"]
-  admin_password          = data.vault_kv_secret_v2.config.data["admin_password"]
-  ca_cert                 = var.ca_cert
-  tls_skip_verify         = var.tls_skip_verify
-  request_timeout_seconds = var.request_timeout_seconds
-
-  lifecycle {
-    # The KV seed is a bootstrap credential: it is consumed only when the engine
-    # config is first created. After creation the live admin password is rotated
-    # in place (vault write -f gitea/config/rotate-root) and diverges from the
-    # seed, so re-reading the (possibly stale) KV value must never push it back.
-    # Ignoring the credential attributes makes this module create-only for them.
-    # (The sibling rancher/litellm seed modules do not yet do this and would
-    # re-push their seed on a subsequent apply.)
-    ignore_changes = [admin_username, admin_password]
-  }
-}

modules/vault_cluster/modules/gitea_secret_backend/terraform.tf

@@ -1,13 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-    gitea = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/giteavaultsecret"
-      version = "0.1.0"
-    }
-  }
-}

modules/vault_cluster/modules/gitea_secret_backend/variables.tf

@@ -1,49 +0,0 @@
-variable "path" {
-  description = "Mount path of the gitea secrets engine (e.g. \"gitea\")"
-  type        = string
-}
-
-variable "plugin" {
-  description = "Registered plugin name to mount (the catalog name = mount type)"
-  type        = string
-  default     = "vault-plugin-secrets-gitea"
-}
-
-variable "description" {
-  description = "Human-friendly description of the mount"
-  type        = string
-  default     = null
-}
-
-variable "gitea_url" {
-  description = "Base URL of the Gitea server (e.g. https://git.unkin.net)"
-  type        = string
-}
-
-variable "country" {
-  description = "Country segment of the KV path holding the seeded admin credentials"
-  type        = string
-}
-
-variable "region" {
-  description = "Region segment of the KV path holding the seeded admin credentials"
-  type        = string
-}
-
-variable "ca_cert" {
-  description = "PEM CA certificate that signed the Gitea server's TLS cert (optional; omit to use the system trust store)"
-  type        = string
-  default     = null
-}
-
-variable "tls_skip_verify" {
-  description = "Skip TLS verification of the Gitea server (not recommended)"
-  type        = bool
-  default     = false
-}
-
-variable "request_timeout_seconds" {
-  description = "HTTP timeout in seconds for calls from the plugin to Gitea"
-  type        = number
-  default     = 30
-}

modules/vault_cluster/modules/gitea_secret_backend_role/main.tf

@@ -1,12 +0,0 @@
-# A role that mints short-lived, scoped gitea tokens for a target Gitea user.
-# Reading gitea/creds/<name> produces a lease-bound token that is deleted from
-# Gitea when the lease is revoked or reaches max_ttl.
-resource "gitea_secret_backend_role" "this" {
-  backend           = var.backend
-  name              = var.name
-  username          = var.username
-  scopes            = var.scopes
-  token_name_prefix = var.token_name_prefix
-  ttl               = var.ttl
-  max_ttl           = var.max_ttl
-}

modules/vault_cluster/modules/gitea_secret_backend_role/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    gitea = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/giteavaultsecret"
-      version = "0.1.0"
-    }
-  }
-}

modules/vault_cluster/modules/gitea_secret_backend_role/variables.tf

@@ -1,37 +0,0 @@
-variable "backend" {
-  description = "Mount path of the gitea secrets engine this role belongs to"
-  type        = string
-}
-
-variable "name" {
-  description = "Role name (read gitea/creds/<name> to mint a token)"
-  type        = string
-}
-
-variable "username" {
-  description = "Target Gitea username the minted tokens belong to"
-  type        = string
-}
-
-variable "scopes" {
-  description = "Gitea access-token scopes granted to minted tokens (write: implies read:)"
-  type        = list(string)
-}
-
-variable "token_name_prefix" {
-  description = "Prefix for the generated Gitea token name (optional)"
-  type        = string
-  default     = null
-}
-
-variable "ttl" {
-  description = "Default lease TTL in seconds for minted tokens"
-  type        = number
-  default     = null
-}
-
-variable "max_ttl" {
-  description = "Maximum lease TTL in seconds for minted tokens"
-  type        = number
-  default     = null
-}

modules/vault_cluster/modules/gpg_key/main.tf

@@ -1,12 +0,0 @@
-# Manages an OpenPGP key inside a gpg secrets engine mount, via the
-# gpgvaultsecret provider. The private key never leaves Vault; consumers use the
-# exported public_key to encrypt and delegate decryption back to the engine.
-resource "gpg_key" "this" {
-  backend                = var.backend
-  name                   = var.name
-  algorithm              = var.algorithm
-  identity               = var.identity
-  exportable             = var.exportable
-  deletion_allowed       = var.deletion_allowed
-  min_decryption_version = var.min_decryption_version
-}

modules/vault_cluster/modules/gpg_key/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    gpg = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/gpgvaultsecret"
-      version = "0.1.0"
-    }
-  }
-}

modules/vault_cluster/modules/gpg_key/variables.tf

@@ -1,39 +0,0 @@
-variable "backend" {
-  description = "Mount path of the gpg secrets engine (e.g. \"gpg\")"
-  type        = string
-}
-
-variable "name" {
-  description = "Name of the key"
-  type        = string
-}
-
-variable "algorithm" {
-  description = "Key algorithm: rsa-2048, rsa-3072, rsa-4096 or ed25519"
-  type        = string
-  default     = "rsa-3072"
-}
-
-variable "identity" {
-  description = "OpenPGP User ID (defaults to the key name)"
-  type        = string
-  default     = null
-}
-
-variable "exportable" {
-  description = "Allow exporting the private key (enable-only)"
-  type        = bool
-  default     = false
-}
-
-variable "deletion_allowed" {
-  description = "Whether the key may be deleted"
-  type        = bool
-  default     = false
-}
-
-variable "min_decryption_version" {
-  description = "Minimum key version usable for decryption/verification"
-  type        = number
-  default     = null
-}

modules/vault_cluster/modules/gpg_secret_backend/main.tf

@@ -1,8 +0,0 @@
-# Mounts the gpg secrets engine. The plugin is registered ("imported") in the
-# catalog separately via the config/plugins/ discovery and the plugin module;
-# this module just enables a mount of the already-registered plugin type.
-resource "vault_mount" "this" {
-  path        = var.path
-  type        = var.plugin
-  description = var.description
-}

modules/vault_cluster/modules/gpg_secret_backend/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-  }
-}

modules/vault_cluster/modules/gpg_secret_backend/variables.tf

@@ -1,16 +0,0 @@
-variable "path" {
-  description = "Mount path of the GPG secrets engine (e.g. \"gpg\")"
-  type        = string
-}
-
-variable "plugin" {
-  description = "Registered plugin name to mount (the catalog name = mount type)"
-  type        = string
-  default     = "vault-plugin-secrets-gpg"
-}
-
-variable "description" {
-  description = "Human-friendly description of the mount"
-  type        = string
-  default     = null
-}

modules/vault_cluster/modules/kubernetes_secret_backend_role/main.tf

@@ -2,10 +2,6 @@ locals {
   # Auto-generate role rules path: resources/secret_backend/{backend_path}/roles/{role_name}.yaml
   role_rules_file = "resources/secret_backend/${var.backend}/roles/${var.name}.yaml"
 
-  # service_account_name mode mints tokens for a pre-existing SA, so the
-  # generated_role_rules / kubernetes_role_type binding fields must be unset.
-  use_service_account = var.service_account_name != null
-
   # Auto-generate extra labels based on country/region and role name
   auto_labels = merge(var.extra_labels, {
     vault-region = "${var.country}-${var.region}"
@@ -17,8 +13,7 @@ resource "vault_kubernetes_secret_backend_role" "role" {
   backend                       = var.backend
   name                          = var.name
   allowed_kubernetes_namespaces = var.allowed_kubernetes_namespaces
-  kubernetes_role_type          = local.use_service_account ? null : var.kubernetes_role_type
-  generated_role_rules          = local.use_service_account ? null : file("${path.module}/../../../../../../../../${local.role_rules_file}")
-  service_account_name          = var.service_account_name
+  kubernetes_role_type          = var.kubernetes_role_type
+  generated_role_rules          = file("${path.module}/../../../../../../../../${local.role_rules_file}")
   extra_labels                  = local.auto_labels
 }

modules/vault_cluster/modules/kubernetes_secret_backend_role/variables.tf

@@ -34,10 +34,4 @@ variable "extra_labels" {
   description = "Additional labels to apply to generated Kubernetes objects"
   type        = map(string)
   default     = {}
-}
-
-variable "service_account_name" {
-  description = "Pre-existing service account to mint tokens for. When set, RBAC comes from that SA's own bindings instead of generated_role_rules."
-  type        = string
-  default     = null
 }

modules/vault_cluster/modules/netbox_secret_backend/main.tf

@@ -1,53 +0,0 @@
-# Mounts the netbox secrets engine and writes its connection config via the
-# vault-secrets-netbox provider. The plugin is registered ("imported") in the
-# catalog separately (config/plugins/vault-plugin-secrets-netbox.yaml). The
-# seeded NetBox admin token is sensitive and read from KV, not stored in git:
-#   kv/service/vault/<country>/<region>/secret_backend/<path>/config
-# Expected key: admin_token (a NetBox token with add_token + grant_token, i.e.
-# able to provision and delegate per-user API tokens).
-data "vault_kv_secret_v2" "config" {
-  mount = "kv"
-  name  = "service/vault/${var.country}/${var.region}/secret_backend/${var.path}/config"
-
-  lifecycle {
-    # The plugin builds its own Authorization header from the token VALUE, not
-    # token_version: a value starting with the nbt_ prefix is sent as
-    # "Bearer <token>" (v2), otherwise "Token <token>" (v1). So admin_token must
-    # be the BARE token - a literal `Bearer `/`Token ` scheme prefix yields a
-    # malformed three-part header and 403s on the plugin's own NetBox calls.
-    #
-    # token_version does NOT change that header; it only selects the version of
-    # the per-user tokens the engine mints for roles. It must still MATCH the
-    # admin token's kind so the mount and its minted creds line up: an nbt_ v2
-    # admin token pairs with token_version=2, a bare v1 token with token_version=1.
-    postcondition {
-      condition = nonsensitive(
-        !startswith(self.data["admin_token"], "Bearer ") &&
-        !startswith(self.data["admin_token"], "Token ") &&
-        startswith(self.data["admin_token"], "nbt_") == (var.token_version == 2)
-      )
-      error_message = "KV admin_token for netbox backend '${var.path}' must be a BARE NetBox token with no 'Bearer '/'Token ' scheme prefix, AND its version must match token_version: a v2 token (nbt_<key>.<secret>) requires token_version=2; a v1 token (bare 40-char value) requires token_version=1."
-    }
-  }
-}
-
-resource "netbox_secret_backend" "this" {
-  path                    = var.path
-  plugin                  = var.plugin
-  description             = var.description
-  netbox_url              = var.netbox_url
-  token                   = data.vault_kv_secret_v2.config.data["admin_token"]
-  token_version           = var.token_version
-  ca_cert                 = var.ca_cert
-  tls_skip_verify         = var.tls_skip_verify
-  request_timeout_seconds = var.request_timeout_seconds
-
-  lifecycle {
-    # The KV seed is a bootstrap credential: it is consumed only when the engine
-    # config is first created. After creation the live admin token is rotated in
-    # place (vault write -f netbox/config/rotate) and diverges from the seed, so
-    # re-reading the (possibly stale) KV value must never push it back. Ignoring
-    # the token makes this module create-only for it (mirrors gitea/config).
-    ignore_changes = [token]
-  }
-}

modules/vault_cluster/modules/netbox_secret_backend/terraform.tf

@@ -1,13 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-    netbox = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/vault-secrets-netbox"
-      version = "0.1.0"
-    }
-  }
-}

modules/vault_cluster/modules/netbox_secret_backend/variables.tf

@@ -1,55 +0,0 @@
-variable "path" {
-  description = "Mount path of the netbox secrets engine (e.g. \"netbox\")"
-  type        = string
-}
-
-variable "plugin" {
-  description = "Registered plugin name to mount (the catalog name = mount type)"
-  type        = string
-  default     = "vault-plugin-secrets-netbox"
-}
-
-variable "description" {
-  description = "Human-friendly description of the mount"
-  type        = string
-  default     = null
-}
-
-variable "netbox_url" {
-  description = "Base URL of the NetBox server (e.g. https://netbox.k8s.syd1.au.unkin.net)"
-  type        = string
-}
-
-variable "token_version" {
-  description = "NetBox API token format: 2 (default, requires API_TOKEN_PEPPERS on the NetBox server) or 1 (legacy plaintext-key)."
-  type        = number
-  default     = 2
-}
-
-variable "country" {
-  description = "Country segment of the KV path holding the seeded admin token"
-  type        = string
-}
-
-variable "region" {
-  description = "Region segment of the KV path holding the seeded admin token"
-  type        = string
-}
-
-variable "ca_cert" {
-  description = "PEM CA certificate that signed the NetBox server's TLS cert (optional; omit to use the system trust store)"
-  type        = string
-  default     = null
-}
-
-variable "tls_skip_verify" {
-  description = "Skip TLS verification of the NetBox server (not recommended)"
-  type        = bool
-  default     = false
-}
-
-variable "request_timeout_seconds" {
-  description = "HTTP timeout in seconds for calls from the plugin to NetBox"
-  type        = number
-  default     = 30
-}

modules/vault_cluster/modules/netbox_secret_backend_role/main.tf

@@ -1,13 +0,0 @@
-# A role that mints short-lived, scoped NetBox tokens for a pre-existing NetBox
-# service user. Reading netbox/creds/<name> produces a lease-bound token that is
-# deleted from NetBox when the lease is revoked or reaches max_ttl.
-resource "netbox_secret_backend_role" "this" {
-  backend         = var.backend
-  name            = var.name
-  netbox_username = var.netbox_username
-  netbox_user_id  = var.netbox_user_id
-  write_enabled   = var.write_enabled
-  description     = var.description
-  ttl             = var.ttl
-  max_ttl         = var.max_ttl
-}

modules/vault_cluster/modules/netbox_secret_backend_role/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    netbox = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/vault-secrets-netbox"
-      version = "0.1.0"
-    }
-  }
-}

modules/vault_cluster/modules/netbox_secret_backend_role/variables.tf

@@ -1,45 +0,0 @@
-variable "backend" {
-  description = "Mount path of the netbox secrets engine this role belongs to"
-  type        = string
-}
-
-variable "name" {
-  description = "Role name (read netbox/creds/<name> to mint a token)"
-  type        = string
-}
-
-variable "netbox_username" {
-  description = "NetBox service username the minted tokens belong to (set this or netbox_user_id)"
-  type        = string
-  default     = null
-}
-
-variable "netbox_user_id" {
-  description = "NetBox service user id the minted tokens belong to (set this or netbox_username)"
-  type        = number
-  default     = null
-}
-
-variable "write_enabled" {
-  description = "Whether minted tokens carry NetBox write access (default read-only)"
-  type        = bool
-  default     = false
-}
-
-variable "description" {
-  description = "Human-friendly description of the role"
-  type        = string
-  default     = null
-}
-
-variable "ttl" {
-  description = "Default lease TTL in seconds for minted tokens (the token's NetBox expiry is aligned to the lease)"
-  type        = number
-  default     = null
-}
-
-variable "max_ttl" {
-  description = "Maximum lease TTL in seconds for minted tokens"
-  type        = number
-  default     = null
-}

modules/vault_cluster/modules/netbox_user_management/.tflint.hcl

@@ -1,7 +0,0 @@
-rule "terraform_required_providers" {
-  enabled = false
-}
-
-rule "terraform_required_version" {
-  enabled = false
-}

modules/vault_cluster/modules/netbox_user_management/main.tf

@@ -1,149 +0,0 @@
-# netbox_user_management reconciles NetBox service users + permissions on every
-# apply, so it needs an admin credential each run. That credential is minted
-# DYNAMICALLY by the netbox engine from the SINGLE static admin token, so no
-# second static credential exists and it survives rotation of the engine seed:
-#
-#   1. module.netbox_user_mgmt_role creates netbox/roles/vault-user-mgmt, a
-#      write-enabled role for a pre-existing NetBox superuser (user_mgmt_username).
-#   2. Reading netbox/creds/vault-user-mgmt mints a short-lived, user-admin-capable
-#      token for that superuser; the e-breuninger provider uses it to CRUD users.
-#
-# The hashicorp/vault provider ships ephemeral resources for KV only, not for
-# dynamic engine creds, so the mint is read via the vault_generic_secret DATA
-# source: the short-lived token transits Terraform state (sensitive, lease-revoked)
-# and is re-minted each plan. This is the closest single-static-token shape the
-# current providers allow; move to an ephemeral resource once the vault provider
-# ships a dynamic-secret one. Ordering note: the vault-user-mgmt role must already
-# exist when this reads creds, so on a brand-new backend bootstrap the mount +
-# role first (targeted apply) - a fresh single apply cannot configure the netbox
-# provider from a role created in the same run.
-locals {
-  # Backends that mint a dynamic user-admin token (a pre-existing superuser named).
-  netbox_dynamic_backends = { for k, v in var.netbox_backends : k => v if v.user_mgmt_username != null }
-  # Backends still using the single static admin_token directly (until a superuser
-  # is named). Bootstrap/degraded path - the same one token, not a second static.
-  netbox_static_backends = { for k, v in var.netbox_backends : k => v if v.user_mgmt_username == null }
-}
-
-# Dynamic path: the engine mints a user-admin token for the superuser. Requires
-# the deployer to read netbox/creds/vault-user-mgmt (policies/netbox/creds).
-data "vault_generic_secret" "user_admin" {
-  for_each = local.netbox_dynamic_backends
-
-  path = "${each.key}/creds/vault-user-mgmt"
-}
-
-# Static fallback: the single admin_token from KV, used only until a superuser is
-# named. NetBox derives the token version from the value's `nbt_` prefix, not the
-# keyword, so the same BARE token works under either scheme; reject a value that
-# carries a literal `Bearer `/`Token ` scheme prefix (a malformed header -> 403).
-data "vault_kv_secret_v2" "netbox_backend_configs" {
-  for_each = local.netbox_static_backends
-
-  mount = "kv"
-  name  = "service/vault/${var.country}/${var.region}/secret_backend/${each.key}/config"
-
-  lifecycle {
-    postcondition {
-      condition = nonsensitive(
-        !startswith(self.data["admin_token"], "Bearer ") &&
-        !startswith(self.data["admin_token"], "Token ")
-      )
-      error_message = "KV admin_token for netbox backend '${each.key}' must be a BARE NetBox token with no 'Bearer '/'Token ' scheme prefix (v2: nbt_<key>.<secret>; v1: the 40-char value)."
-    }
-  }
-}
-
-# Warn (non-fatal) for any backend still on the static token: rotating the engine
-# admin seed would then break user management. Set user_mgmt_username to switch to
-# the dynamic, rotation-proof mint.
-check "netbox_user_mgmt_dynamic" {
-  assert {
-    condition     = length(local.netbox_static_backends) == 0
-    error_message = "A netbox backend has no user_mgmt_username, so user management uses the static admin_token directly and will break if that token is rotated (netbox/config/rotate). Set user_mgmt_username to a pre-existing NetBox superuser to mint the credential dynamically."
-  }
-}
-
-locals {
-  # Per backend: the dynamically-minted user-admin token, else the static seed.
-  netbox_admin_tokens = {
-    for k, v in var.netbox_backends : k => (
-      v.user_mgmt_username != null
-      ? data.vault_generic_secret.user_admin[k].data["token"]
-      : data.vault_kv_secret_v2.netbox_backend_configs[k].data["admin_token"]
-    )
-  }
-}
-
-# One NetBox provider instance per backend, authenticated with its (dynamic or
-# static) admin token.
-provider "netbox" {
-  alias    = "by_backend"
-  for_each = var.netbox_backend_aliases
-
-  server_url           = var.netbox_backends[each.key].netbox_url
-  api_token            = local.netbox_admin_tokens[each.key]
-  allow_insecure_https = var.netbox_backends[each.key].tls_skip_verify
-  # NetBox is internal and not always reachable at plan time; the resource CRUD
-  # calls surface any real incompatibility, so skip the startup version probe.
-  skip_version_check = true
-}
-
-# NetBox users authenticate only via Vault-minted API tokens, never the web UI,
-# so give each a random unknown password (required by the API) that no one holds.
-resource "random_password" "user" {
-  for_each = var.netbox_roles
-
-  length  = 32
-  special = true
-}
-
-# Declarative NetBox service users, one per engine role. The role's filename-
-# derived name is the username, so the engine role and its user match 1:1.
-resource "netbox_user" "users" {
-  for_each = var.netbox_roles
-
-  provider = netbox.by_backend[each.value.backend]
-
-  username = each.value.name
-  password = random_password.user[each.key].result
-  active   = each.value.active
-  staff    = each.value.staff
-  email    = each.value.email
-}
-
-locals {
-  # Flatten roles x permissions into one map keyed by "<role_path>:<index>". A
-  # permission's name defaults to the role name (the username) so a single-
-  # permission identity repeats nothing already encoded by the filename.
-  netbox_permissions = merge([
-    for role_key, role in var.netbox_roles : {
-      for idx, perm in role.permissions :
-      "${role_key}:${idx}" => {
-        backend      = role.backend
-        user         = role_key
-        name         = coalesce(perm.name, length(role.permissions) == 1 ? role.name : "${role.name}-${idx}")
-        object_types = perm.object_types
-        actions      = perm.actions
-        constraints  = perm.constraints
-        description  = perm.description
-        enabled      = perm.enabled
-      }
-    }
-  ]...)
-}
-
-# Object permissions granting each user its object-type/action scope.
-resource "netbox_permission" "perms" {
-  for_each = local.netbox_permissions
-
-  provider = netbox.by_backend[each.value.backend]
-
-  name         = each.value.name
-  object_types = each.value.object_types
-  actions      = each.value.actions
-  enabled      = each.value.enabled
-  description  = each.value.description
-  constraints  = each.value.constraints
-  users        = [tonumber(netbox_user.users[each.value.user].id)]
-}

modules/vault_cluster/modules/netbox_user_management/outputs.tf

@@ -1,19 +0,0 @@
-output "netbox_users" {
-  description = "Map of created NetBox users (id + username; password is intentionally omitted)"
-  value = {
-    for k, u in netbox_user.users : k => {
-      id       = u.id
-      username = u.username
-    }
-  }
-}
-
-output "netbox_permissions" {
-  description = "Map of created NetBox object permissions"
-  value = {
-    for k, p in netbox_permission.perms : k => {
-      id   = p.id
-      name = p.name
-    }
-  }
-}