feat: add pre-commit check in ci

- add a ci workflow to verify pre-commit passes
- fix pre-commit errors/warnings:
  - missing required_version

.woodpecker/apply.yaml

@@ -1,23 +0,0 @@
-when:
-  - event: push
-    branch: master
-
-steps:
-  - name: apply
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
-    environment:
-      VAULT_AUTH_METHOD: kubernetes
-    commands:
-      - dnf install vault -y
-      - make plan
-      - make apply
-    backend_options:
-      kubernetes:
-        serviceAccountName: terraform-vault
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2

.woodpecker/plan.yaml

@@ -1,21 +0,0 @@
-when:
-  - event: pull_request
-
-steps:
-  - name: plan
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
-    environment:
-      VAULT_AUTH_METHOD: kubernetes
-    commands:
-      - dnf install vault -y
-      - make plan
-    backend_options:
-      kubernetes:
-        serviceAccountName: terraform-vault
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2

.woodpecker/pre-commit.yaml

@@ -3,16 +3,7 @@ when:
 
 steps:
   - name: pre-commit
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
+    image: git.unkin.net/unkin/almalinux9-base:latest
     commands:
+      - dnf install uv opentofu terragrunt tflint -y
       - uvx pre-commit run --all-files
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2

Makefile

@@ -1,19 +1,10 @@
 .PHONY: init plan apply format
 
-VAULT_AUTH_METHOD ?= approle
-VAULT_K8S_ROLE ?= woodpecker_terraform_vault
-VAULT_K8S_MOUNT ?= auth/k8s/au/syd1
-VAULT_K8S_JWT_PATH ?= /var/run/secrets/kubernetes.io/serviceaccount/token
-
 # Define vault_env function to set up vault environment
 define vault_env
 	@export VAULT_ADDR="https://vault.service.consul:8200" && \
-	if [ "$(VAULT_AUTH_METHOD)" = "kubernetes" ]; then \
-		export VAULT_TOKEN=$$(vault write -field=token $(VAULT_K8S_MOUNT)/login role=$(VAULT_K8S_ROLE) jwt=$$(cat $(VAULT_K8S_JWT_PATH))); \
-	else \
-		export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID); \
-	fi && \
-	export CONSUL_HTTP_TOKEN=$$(vault read -field=token consul_root/au/syd1/creds/terraform-vault)
+	export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \
+	export CONSUL_HTTP_TOKEN=$$(vault read -format=json consul_root/au/syd1/creds/terraform-vault | jq '.data.token')
 endef
 
 init:

config/auth_approle_role/approle/terraform_artifactapi.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_authentik.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_git.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_prowlarr.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_radarr.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_sonarr.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/artifactapi.yaml

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

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

@@ -1,6 +0,0 @@
-bound_service_account_names:
-  - default
-bound_service_account_namespaces: ['*']
-token_ttl: 600
-token_max_ttl: 600
-audience: vault

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

@@ -1,8 +0,0 @@
-# rpmbuilder is deployed in woodpeckerci
-bound_service_account_names:
-  - default
-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_artifactapi.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-artifactapi
-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_authentik.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-authentik
-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_git.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-git
-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_prowlarr.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-prowlarr
-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_radarr.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-radarr
-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_sonarr.yaml

@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-sonarr
-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_vault.yaml

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

config/config.hcl

@@ -185,18 +185,5 @@ locals {
       trimsuffix(basename(file_path), ".yaml") => content
       if startswith(file_path, "pki_mount_only/")
     }
-    litellm_secret_backend = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => content
-      if startswith(file_path, "litellm_secret_backend/")
-    }
-    litellm_secret_backend_role = {
-      for file_path, content in local.all_configs :
-      trimsuffix(replace(file_path, "litellm_secret_backend_role/", ""), ".yaml") => merge(content, {
-        name    = trimsuffix(basename(file_path), ".yaml")
-        backend = dirname(replace(file_path, "litellm_secret_backend_role/", ""))
-      })
-      if startswith(file_path, "litellm_secret_backend_role/")
-    }
   }
 }

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

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

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

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

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

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

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

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

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

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

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

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

config/litellm_secret_backend/litellm.yaml

@@ -1,6 +0,0 @@
-# Mounts the LiteLLM dynamic secrets engine at "litellm" and writes its config.
-# 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: "http://litellm.litellm.svc:4000"
-request_timeout_seconds: 30

config/litellm_secret_backend_role/litellm/rspamd.yaml

@@ -1,10 +0,0 @@
----
-models:
-  - claude-haiku-4-5
-  - claude-sonnet-4-6
-max_budget: 50
-ttl: 3600      # seconds (1h)
-max_ttl: 86400 # seconds (24h)
-metadata:
-  team: mailfiltering
-  env: prod

environments/au/syd1/terragrunt.hcl

@@ -68,8 +68,6 @@ inputs = {
   kubernetes_secret_backend      = local.config.kubernetes_secret_backend
   kubernetes_secret_backend_role = local.config.kubernetes_secret_backend_role
   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
 
   # Pass policy maps to vault_cluster module
   policy_auth_map  = local.policies.policy_auth_map

environments/root.hcl

@@ -11,12 +11,6 @@ provider "vault" {
   address = local.vault_addr
 }
 
-# The LiteLLM secrets engine is managed through its own provider, which talks to
-# the same Vault server. Token falls back to the VAULT_TOKEN environment variable.
-provider "litellm" {
-  address = local.vault_addr
-}
-
 terraform {
   backend "consul" {
     address = "https://consul.service.consul"
@@ -35,10 +29,6 @@ terraform {
       source  = "hashicorp/consul"
       version = "2.23.0"
     }
-    litellm = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/litellmvaultsecret"
-      version = "0.1.0"
-    }
   }
 }
 EOF

modules/vault_cluster/.tflint.hcl

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

modules/vault_cluster/main.tf

@@ -3,6 +3,8 @@ module "auth_approle_backend" {
 
   for_each = var.auth_approle_backend
 
+  country            = var.country
+  region             = var.region
   path               = each.key
   listing_visibility = each.value.listing_visibility
   default_lease_ttl  = each.value.default_lease_ttl
@@ -184,6 +186,7 @@ module "pki_secret_backend" {
   crl_distribution_points       = each.value.crl_distribution_points
   ocsp_servers                  = each.value.ocsp_servers
   enable_templating             = each.value.enable_templating
+  default_issuer_ref            = each.value.default_issuer_ref
   default_follows_latest_issuer = each.value.default_follows_latest_issuer
   crl_expiry                    = each.value.crl_expiry
   crl_disable                   = each.value.crl_disable
@@ -263,11 +266,12 @@ module "consul_secret_backend_role" {
 
   for_each = var.consul_secret_backend_role
 
-  name    = each.value.name
-  backend = each.value.backend
-  ttl     = each.value.ttl
-  max_ttl = each.value.max_ttl
-  local   = each.value.local
+  name         = each.value.name
+  backend      = each.value.backend
+  consul_roles = each.value.consul_roles
+  ttl          = each.value.ttl
+  max_ttl      = each.value.max_ttl
+  local        = each.value.local
 
   depends_on = [module.consul_secret_backend, module.consul_acl_management]
 }
@@ -303,37 +307,6 @@ module "kubernetes_secret_backend_role" {
   depends_on = [module.kubernetes_secret_backend]
 }
 
-module "litellm_secret_backend" {
-  source = "./modules/litellm_secret_backend"
-
-  for_each = var.litellm_secret_backend
-
-  country                 = var.country
-  region                  = var.region
-  path                    = each.key
-  plugin                  = each.value.plugin
-  description             = each.value.description
-  base_url                = each.value.base_url
-  request_timeout_seconds = each.value.request_timeout_seconds
-}
-
-module "litellm_secret_backend_role" {
-  source = "./modules/litellm_secret_backend_role"
-
-  for_each = var.litellm_secret_backend_role
-
-  name             = each.value.name
-  backend          = each.value.backend
-  models           = each.value.models
-  max_budget       = each.value.max_budget
-  key_alias_prefix = each.value.key_alias_prefix
-  ttl              = each.value.ttl
-  max_ttl          = each.value.max_ttl
-  metadata         = each.value.metadata
-
-  depends_on = [module.litellm_secret_backend]
-}
-
 module "vault_policy" {
   source = "./modules/vault_policy"
 
@@ -351,6 +324,7 @@ module "pki_mount_only" {
   path                          = each.key
   description                   = each.value.description
   max_lease_ttl_seconds         = each.value.max_lease_ttl_seconds
+  issuer_ref                    = each.value.issuer_ref
   issuing_certificates          = each.value.issuing_certificates
   crl_distribution_points       = each.value.crl_distribution_points
   ocsp_servers                  = each.value.ocsp_servers

modules/vault_cluster/modules/auth_approle_backend/variables.tf

@@ -1,3 +1,13 @@
+variable "country" {
+  description = "Country identifier"
+  type        = string
+}
+
+variable "region" {
+  description = "Region identifier"
+  type        = string
+}
+
 variable "path" {
   description = "Mount path of the AppRole auth backend"
   type        = string
@@ -24,4 +34,4 @@ 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_approle_role/main.tf

@@ -16,7 +16,7 @@ data "vault_kv_secret_v2" "role_config" {
 locals {
   salt                  = data.vault_kv_secret_v2.salt_config.data["salt"]
   role_id_input         = "${local.salt}-${var.approle_name}-${var.mount_path}"
-  deterministic_role_id = uuidv5("dns", local.role_id_input)
+  deterministic_role_id = uuidv5("dns", "${local.role_id_input}")
 
   # Use deterministic role-id by default, or read from KV if specified
   role_id = var.use_deterministic_role_id ? local.deterministic_role_id : data.vault_kv_secret_v2.role_config[0].data["role_id"]

modules/vault_cluster/modules/consul_secret_backend_role/variables.tf

@@ -9,6 +9,12 @@ variable "name" {
 }
 
 
+variable "consul_roles" {
+  description = "List of Consul roles to attach to tokens"
+  type        = list(string)
+  default     = []
+}
+
 
 variable "ttl" {
   description = "TTL for generated tokens"

modules/vault_cluster/modules/litellm_secret_backend/main.tf

@@ -1,14 +0,0 @@
-# Expected keys in KV secret: master_key
-data "vault_kv_secret_v2" "secret_backend_config" {
-  mount = "kv"
-  name  = "service/vault/${var.country}/${var.region}/secret_backend/${var.path}"
-}
-
-resource "litellm_secret_backend" "this" {
-  path                    = var.path
-  plugin                  = var.plugin
-  description             = var.description
-  base_url                = var.base_url
-  master_key              = data.vault_kv_secret_v2.secret_backend_config.data["master_key"]
-  request_timeout_seconds = var.request_timeout_seconds
-}

modules/vault_cluster/modules/litellm_secret_backend/terraform.tf

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

modules/vault_cluster/modules/litellm_secret_backend/variables.tf

@@ -1,37 +0,0 @@
-variable "country" {
-  description = "Country identifier (used to locate the KV secret holding the master key)"
-  type        = string
-}
-
-variable "region" {
-  description = "Region identifier (used to locate the KV secret holding the master key)"
-  type        = string
-}
-
-variable "path" {
-  description = "Mount path of the LiteLLM secrets engine"
-  type        = string
-}
-
-variable "plugin" {
-  description = "Registered plugin name/type to mount"
-  type        = string
-  default     = "vault-plugin-secrets-litellm"
-}
-
-variable "description" {
-  description = "Human-friendly description of the mount"
-  type        = string
-  default     = null
-}
-
-variable "base_url" {
-  description = "Base URL of the LiteLLM proxy (e.g. http://litellm.litellm.svc:4000)"
-  type        = string
-}
-
-variable "request_timeout_seconds" {
-  description = "HTTP timeout in seconds for calls from the plugin to the LiteLLM proxy"
-  type        = number
-  default     = 30
-}

modules/vault_cluster/modules/litellm_secret_backend_role/main.tf

@@ -1,10 +0,0 @@
-resource "litellm_secret_backend_role" "this" {
-  backend          = var.backend
-  name             = var.name
-  models           = var.models
-  max_budget       = var.max_budget
-  key_alias_prefix = var.key_alias_prefix
-  ttl              = var.ttl
-  max_ttl          = var.max_ttl
-  metadata         = var.metadata
-}

modules/vault_cluster/modules/litellm_secret_backend_role/terraform.tf

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

modules/vault_cluster/modules/litellm_secret_backend_role/variables.tf

@@ -1,45 +0,0 @@
-variable "name" {
-  description = "Name of the role"
-  type        = string
-}
-
-variable "backend" {
-  description = "Mount path of the LiteLLM secrets engine this role belongs to"
-  type        = string
-}
-
-variable "models" {
-  description = "Models a generated key may access. Empty means unrestricted"
-  type        = list(string)
-  default     = null
-}
-
-variable "max_budget" {
-  description = "Spending limit applied to each generated key. 0 means unlimited"
-  type        = number
-  default     = null
-}
-
-variable "key_alias_prefix" {
-  description = "Prefix for the auto-generated key alias"
-  type        = string
-  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
-}
-
-variable "metadata" {
-  description = "Metadata attached to each generated key"
-  type        = map(string)
-  default     = null
-}

modules/vault_cluster/modules/pki_mount_only/main.tf

@@ -5,6 +5,11 @@ resource "vault_mount" "pki" {
   max_lease_ttl_seconds = var.max_lease_ttl_seconds
 }
 
+data "vault_pki_secret_backend_issuer" "issuer" {
+  backend    = vault_mount.pki.path
+  issuer_ref = var.issuer_ref
+}
+
 resource "vault_pki_secret_backend_config_urls" "config_urls" {
   backend = vault_mount.pki.path
 
@@ -30,4 +35,4 @@ resource "vault_pki_secret_backend_crl_config" "crl" {
   auto_rebuild           = var.auto_rebuild
   enable_delta           = var.enable_delta
   delta_rebuild_interval = var.delta_rebuild_interval
-}
+}

modules/vault_cluster/modules/pki_mount_only/variables.tf

@@ -13,6 +13,11 @@ variable "max_lease_ttl_seconds" {
   type        = number
 }
 
+variable "issuer_ref" {
+  description = "Reference to the PKI issuer (default, or issuer ID/name)"
+  type        = string
+  default     = "default"
+}
 
 variable "issuing_certificates" {
   description = "List of URLs for issuing certificates"
@@ -84,4 +89,4 @@ variable "delta_rebuild_interval" {
   description = "Delta CRL rebuild interval"
   type        = string
   default     = null
-}
+}

modules/vault_cluster/modules/pki_secret_backend/variables.tf

@@ -61,6 +61,12 @@ variable "enable_templating" {
   default     = false
 }
 
+variable "default_issuer_ref" {
+  description = "Reference to the default issuer"
+  type        = string
+  default     = null
+}
+
 variable "default_follows_latest_issuer" {
   description = "Whether the default issuer should follow the latest issuer"
   type        = bool
@@ -101,4 +107,4 @@ variable "delta_rebuild_interval" {
   description = "Delta CRL rebuild interval"
   type        = string
   default     = null
-}
+}

modules/vault_cluster/variables.tf

@@ -166,6 +166,7 @@ variable "pki_secret_backend" {
     crl_distribution_points       = optional(list(string), [])
     ocsp_servers                  = optional(list(string), [])
     enable_templating             = optional(bool, false)
+    default_issuer_ref            = optional(string)
     default_follows_latest_issuer = optional(bool, false)
     crl_expiry                    = optional(string, "72h")
     crl_disable                   = optional(bool, false)
@@ -203,6 +204,7 @@ variable "pki_mount_only" {
   type = map(object({
     description                   = optional(string)
     max_lease_ttl_seconds         = optional(number, 315360000)
+    issuer_ref                    = optional(string, "default")
     issuing_certificates          = optional(list(string), [])
     crl_distribution_points       = optional(list(string), [])
     ocsp_servers                  = optional(list(string), [])
@@ -289,32 +291,6 @@ variable "kubernetes_secret_backend_role" {
   default = {}
 }
 
-variable "litellm_secret_backend" {
-  description = "Map of LiteLLM secret engines to create (mount + config). The master key is read from KV"
-  type = map(object({
-    plugin                  = optional(string, "vault-plugin-secrets-litellm")
-    description             = optional(string)
-    base_url                = string
-    request_timeout_seconds = optional(number, 30)
-  }))
-  default = {}
-}
-
-variable "litellm_secret_backend_role" {
-  description = "Map of LiteLLM roles to create"
-  type = map(object({
-    name             = string
-    backend          = string
-    models           = optional(list(string))
-    max_budget       = optional(number)
-    key_alias_prefix = optional(string)
-    ttl              = optional(number)
-    max_ttl          = optional(number)
-    metadata         = optional(map(string))
-  }))
-  default = {}
-}
-
 variable "policy_auth_map" {
   description = "Map of auth mounts -> auth roles -> policy names"
   type        = map(map(list(string)))

policies/auth/approle/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/auth/approle/login.yaml

@@ -8,5 +8,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/auth/k8s/au/syd1/admin.yaml

@@ -21,5 +21,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/auth/ldap/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/auth/token/create.yaml

@@ -15,5 +15,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/auth/token/lookup.yaml

@@ -9,5 +9,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/auth/token/renew.yaml

@@ -8,5 +8,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/auth/token/roles/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/auth/token/self.yaml

@@ -14,5 +14,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/consul_root/au/syd1/config/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/consul_root/au/syd1/creds/terraform-artifactapi.yaml

@@ -1,11 +0,0 @@
----
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-artifactapi"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_artifactapi
-  k8s/au/syd1:
-    - woodpecker_terraform_artifactapi

policies/consul_root/au/syd1/creds/terraform-authentik.yaml

@@ -1,11 +0,0 @@
----
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-authentik"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_authentik
-  k8s/au/syd1:
-    - woodpecker_terraform_authentik

policies/consul_root/au/syd1/creds/terraform-git.yaml

@@ -1,11 +0,0 @@
----
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-git"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_git
-  k8s/au/syd1:
-    - woodpecker_terraform_git

policies/consul_root/au/syd1/creds/terraform-prowlarr.yaml

@@ -1,11 +0,0 @@
----
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-prowlarr"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_prowlarr
-  k8s/au/syd1:
-    - woodpecker_terraform_prowlarr

policies/consul_root/au/syd1/creds/terraform-radarr.yaml

@@ -1,11 +0,0 @@
----
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-radarr"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_radarr
-  k8s/au/syd1:
-    - woodpecker_terraform_radarr

policies/consul_root/au/syd1/creds/terraform-sonarr.yaml

@@ -1,11 +0,0 @@
----
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-sonarr"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_sonarr
-  k8s/au/syd1:
-    - woodpecker_terraform_sonarr

policies/consul_root/au/syd1/creds/terraform-vault.yaml

@@ -8,5 +8,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/consul_root/au/syd1/roles/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kubernetes/au/config_admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kubernetes/au/roles_admin.yaml

@@ -15,5 +15,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kubernetes/au/syd1/creds/media-apps-operator.yaml

@@ -8,5 +8,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kv/config/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kv/kubernetes/default.yaml

@@ -1,16 +0,0 @@
-# Templated access to kv secrets for kubernetes
-#
-# kv/kubernetes/namespace/<namespace>/<service_account>
-# kv/kubernetes/cluster/<cluster>/<namespace>/<service_account>
----
-rules:
-  - path: "kv/data/kubernetes/namespace/{{identity.entity.aliases.auth_kubernetes_ac24966b.metadata.service_account_namespace}}/{{identity.entity.aliases.auth_kubernetes_ac24966b.metadata.service_account_name}}/*"
-    capabilities:
-      - read
-  - path: "kv/data/kubernetes/cluster/au/syd1/{{identity.entity.aliases.auth_kubernetes_ac24966b.metadata.service_account_namespace}}/{{identity.entity.aliases.auth_kubernetes_ac24966b.metadata.service_account_name}}/*"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - default

policies/kv/service/artifactapi/environment/read.yaml

@@ -1,10 +0,0 @@
-# Allow reading environment variables for artifactapi
----
-rules:
-  - path: "kv/data/service/artifactapi/environment"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - artifactapi

policies/kv/service/artifactapi/postgres-password/read.yaml

@@ -1,10 +0,0 @@
-# Allow reading environment vars for postgres/artifactapi
----
-rules:
-  - path: "kv/data/service/artifactapi/postgres-password"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - artifactapi

policies/kv/service/gitea/gitadmin/tokens/terraform-git/read.yaml

@@ -1,12 +0,0 @@
-# Allow reading Gitea admin token
----
-rules:
-  - path: "kv/data/service/gitea/gitadmin/tokens/terraform-git"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_git
-  k8s/au/syd1:
-    - woodpecker_terraform_git

policies/kv/service/gitea/unkinben/tokens/read-only-packages/read.yaml

@@ -8,5 +8,3 @@ rules:
 auth:
   approle:
     - rpmbuilder
-  k8s/au/syd1:
-    - rpmbuilder

policies/kv/service/github/neoloc/tokens/read-only-token/read.yaml

@@ -8,5 +8,3 @@ rules:
 auth:
   approle:
     - rpmbuilder
-  k8s/au/syd1:
-    - rpmbuilder

policies/kv/service/glauth/services/svc_vault/read.yaml

@@ -9,5 +9,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kv/service/kubernetes/au/syd1/service_account_jwt/read.yaml

@@ -8,5 +8,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kv/service/kubernetes/au/syd1/token_reviewer_jwt/read.yaml

@@ -8,5 +8,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kv/service/media-apps/prowlarr/read.yaml

@@ -6,8 +6,5 @@ rules:
       - read
 
 auth:
-  approle:
-    - terraform_prowlarr
   k8s/au/syd1:
     - media-apps
-    - woodpecker_terraform_prowlarr

policies/kv/service/media-apps/radarr/read.yaml

@@ -6,8 +6,5 @@ rules:
       - read
 
 auth:
-  approle:
-    - terraform_radarr
   k8s/au/syd1:
     - media-apps
-    - woodpecker_terraform_radarr

policies/kv/service/media-apps/sonarr/read.yaml

@@ -6,8 +6,5 @@ rules:
       - read
 
 auth:
-  approle:
-    - terraform_sonarr
   k8s/au/syd1:
     - media-apps
-    - woodpecker_terraform_sonarr

policies/kv/service/terraform/authentik.yaml

@@ -1,18 +0,0 @@
-# Allow the Terraform Authentik runner to read:
-#  - its own Authentik API token (provider auth), and
-#  - OAuth2/OIDC client secrets that back authentik providers (per target
-#    service's kv namespace path, via the module's data.vault_kv_secret_v2).
----
-rules:
-  - path: "kv/data/service/terraform/authentik"
-    capabilities:
-      - read
-  - path: "kv/data/kubernetes/namespace/+/default/oauth-credentials"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_authentik
-  k8s/au/syd1:
-    - woodpecker_terraform_authentik

policies/kv/service/vault/auth_approle_roles_read.yaml

@@ -9,5 +9,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kv/service/vault/auth_backends_read.yaml

@@ -9,5 +9,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kv/service/vault/secret_backends_read.yaml

@@ -9,5 +9,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/kv/service/woodpecker/tokens/gitadmin.yaml

@@ -1,11 +0,0 @@
----
-rules:
-  - path: "kv/data/service/woodpecker/tokens/gitadmin"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_git
-  k8s/au/syd1:
-    - woodpecker_terraform_git

policies/kv/service/woodpecker/woodpecker-agent-secret/read.yaml

@@ -1,10 +0,0 @@
-# Allow reading woodpecker agent secret for auto joining more agents
----
-rules:
-  - path: "kv/data/service/woodpecker/woodpecker-agent-secret"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - woodpecker

policies/litellm/admin.yaml

@@ -1,26 +0,0 @@
-# Allow management of the LiteLLM secrets engine (config and roles)
----
-rules:
-  - path: "litellm/config"
-    capabilities:
-      - create
-      - update
-      - read
-      - delete
-  - path: "litellm/roles/*"
-    capabilities:
-      - create
-      - update
-      - delete
-      - read
-      - list
-  - path: "litellm/roles"
-    capabilities:
-      - read
-      - list
-
-auth:
-  approle:
-    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki/au/syd1/config/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki/au/syd1/issuer/admin.yaml

@@ -9,5 +9,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki/au/syd1/roles/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki_int/config/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki_int/issuer/admin.yaml

@@ -9,5 +9,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki_int/roles/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki_root/config/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki_root/issuer/admin.yaml

@@ -9,5 +9,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/pki_root/roles/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/rundeck/config/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/sshca/config/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/sshca/roles/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/sys/auth/admin.yaml

@@ -12,5 +12,3 @@ rules:
 auth:
   approle:
     - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault