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.
feat: manage litellm secrets engine via terraform-provider-litellmvaultsecret
2026-07-07 00:23:20 +10:00 · 2026-07-07 00:15:07 +10:00
60 changed files with 3 additions and 1124 deletions
@@ -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:
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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
@@ -198,59 +198,5 @@ locals {
      })
      if startswith(file_path, "litellm_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/")
-    }
  }
 }
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-enc
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-rancher
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -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
@@ -1,14 +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.
-# Reading gitea/creds/teabot-implementer mints a lease-bound token deleted from
-# Gitea on revoke/expiry.
---
-username: teabot-implementer
-scopes:
-  - write:repository
-  - write:issue
-token_name_prefix: vault-teabot-implementer
-ttl: 3600      # 1h
-max_ttl: 14400 # 4h
@@ -1,14 +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 scopes.
-# Reading gitea/creds/teabot-reviewer mints a lease-bound token deleted from
-# Gitea on revoke/expiry.
---
-username: teabot-reviewer
-scopes:
-  - read:repository
-  - write:issue
-token_name_prefix: vault-teabot-reviewer
-ttl: 3600      # 1h
-max_ttl: 14400 # 4h
@@ -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
@@ -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)"
@@ -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
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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)
@@ -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
@@ -70,16 +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
-  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

  # Pass policy maps to vault_cluster module
  policy_auth_map  = local.policies.policy_auth_map
@@ -17,18 +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
-}
-
 terraform {
  backend "consul" {
    address = "https://consul.service.consul"
@@ -51,14 +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"
-    }
  }
 }
 EOF
@@ -334,127 +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 "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 "vault_policy" {
  source = "./modules/vault_policy"

@@ -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]
-  }
-}
@@ -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"
-    }
-  }
-}
@@ -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
-}
@@ -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
-}
@@ -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"
-    }
-  }
-}
@@ -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
-}
@@ -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
-}
@@ -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"
-    }
-  }
-}
@@ -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
-}
@@ -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
-}
@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-  }
-}
@@ -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
-}
@@ -1,12 +0,0 @@
-# Registers ("imports") a plugin binary in the Vault/OpenBao plugin catalog so
-# it can be mounted. The binary must already exist in the server
-# plugin_directory (installed out of band, e.g. by Puppet); `command` is its
-# filename there. The sha256 must match the on-disk binary or the server refuses
-# to launch the plugin.
-resource "vault_plugin" "this" {
-  type    = var.type
-  name    = var.name
-  command = coalesce(var.command, var.name)
-  sha256  = var.sha256
-  version = var.plugin_version
-}
@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-  }
-}
@@ -1,27 +0,0 @@
-variable "name" {
-  description = "Name to register the plugin under in the catalog (also the mount type)"
-  type        = string
-}
-
-variable "type" {
-  description = "Plugin type: secret, auth or database"
-  type        = string
-  default     = "secret"
-}
-
-variable "command" {
-  description = "Plugin binary filename relative to the server plugin_directory. Defaults to the plugin name."
-  type        = string
-  default     = null
-}
-
-variable "sha256" {
-  description = "SHA-256 of the installed plugin binary; must match the on-disk binary"
-  type        = string
-}
-
-variable "plugin_version" {
-  description = "Optional plugin version to register the catalog entry under"
-  type        = string
-  default     = null
-}
@@ -1,13 +0,0 @@
-# Mounts the rancher secrets engine and writes its connection config via the
-# ranchervaultsecret provider. The plugin is registered ("imported") in the
-# catalog separately (config/plugins/vault-plugin-secrets-rancher.yaml). Seeded
-# service-account tokens and roles are managed by the sibling modules.
-resource "rancher_secret_backend" "this" {
-  path                    = var.path
-  plugin                  = var.plugin
-  description             = var.description
-  rancher_url             = var.rancher_url
-  ca_cert                 = var.ca_cert
-  tls_skip_verify         = var.tls_skip_verify
-  request_timeout_seconds = var.request_timeout_seconds
-}
@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    rancher = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/ranchervaultsecret"
-      version = "0.1.0"
-    }
-  }
-}
@@ -1,39 +0,0 @@
-variable "path" {
-  description = "Mount path of the rancher secrets engine (e.g. \"rancher\")"
-  type        = string
-}
-
-variable "plugin" {
-  description = "Registered plugin name to mount (the catalog name = mount type)"
-  type        = string
-  default     = "vault-plugin-secrets-rancher"
-}
-
-variable "description" {
-  description = "Human-friendly description of the mount"
-  type        = string
-  default     = null
-}
-
-variable "rancher_url" {
-  description = "Base URL of the Rancher server (e.g. https://rancher.k8s.syd1.au.unkin.net)"
-  type        = string
-}
-
-variable "ca_cert" {
-  description = "PEM CA certificate that signed the Rancher 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 Rancher server (not recommended)"
-  type        = bool
-  default     = false
-}
-
-variable "request_timeout_seconds" {
-  description = "HTTP timeout in seconds for calls from the plugin to Rancher"
-  type        = number
-  default     = 30
-}
@@ -1,11 +0,0 @@
-# A role that mints short-lived, optionally cluster-scoped rancher tokens from a
-# service account. Reading rancher/creds/<name> produces a lease-bound token.
-resource "rancher_secret_backend_role" "this" {
-  backend         = var.backend
-  name            = var.name
-  service_account = var.service_account
-  cluster_name    = var.cluster_name
-  description     = var.description
-  ttl             = var.ttl
-  max_ttl         = var.max_ttl
-}
@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    rancher = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/ranchervaultsecret"
-      version = "0.1.0"
-    }
-  }
-}
@@ -1,38 +0,0 @@
-variable "backend" {
-  description = "Mount path of the rancher secrets engine this role lives on"
-  type        = string
-}
-
-variable "name" {
-  description = "Role name"
-  type        = string
-}
-
-variable "service_account" {
-  description = "Service account (seeded token) used to mint credentials; its user's RBAC is inherited by minted tokens"
-  type        = string
-}
-
-variable "cluster_name" {
-  description = "Downstream cluster to scope minted tokens to (empty = full Rancher-server scope)"
-  type        = string
-  default     = null
-}
-
-variable "description" {
-  description = "Description applied to each minted Rancher token"
-  type        = string
-  default     = null
-}
-
-variable "ttl" {
-  description = "Default lease TTL in seconds for tokens minted from this role"
-  type        = number
-  default     = null
-}
-
-variable "max_ttl" {
-  description = "Maximum lease TTL in seconds for tokens minted from this role"
-  type        = number
-  default     = null
-}
@@ -1,18 +0,0 @@
-# Seeds an auto-rotated rancher service-account token. The seed token is
-# sensitive and read from KV, not stored in git:
-#   kv/service/vault/<country>/<region>/secret_backend/<backend>/service_account/<name>
-# Expected keys: token (required), token_name (optional, the ext.cattle.io Token
-# metadata.name so the engine can delete the seed after the first rotation).
-data "vault_kv_secret_v2" "seed" {
-  mount = "kv"
-  name  = "service/vault/${var.country}/${var.region}/secret_backend/${var.backend}/service_account/${var.name}"
-}
-
-resource "rancher_secret_backend_service_account" "this" {
-  backend         = var.backend
-  name            = var.name
-  token           = data.vault_kv_secret_v2.seed.data["token"]
-  token_name      = lookup(data.vault_kv_secret_v2.seed.data, "token_name", null)
-  token_ttl       = var.token_ttl
-  rotation_period = var.rotation_period
-}
@@ -1,13 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-    rancher = {
-      source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/ranchervaultsecret"
-      version = "0.1.0"
-    }
-  }
-}
@@ -1,31 +0,0 @@
-variable "backend" {
-  description = "Mount path of the rancher secrets engine this service account lives on"
-  type        = string
-}
-
-variable "name" {
-  description = "Service-account name"
-  type        = string
-}
-
-variable "country" {
-  description = "Country code, used to locate the seed token in KV"
-  type        = string
-}
-
-variable "region" {
-  description = "Region code, used to locate the seed token in KV"
-  type        = string
-}
-
-variable "token_ttl" {
-  description = "Lifetime in seconds requested for each rotated replacement token (default: engine default, 90d)"
-  type        = number
-  default     = null
-}
-
-variable "rotation_period" {
-  description = "Seconds a token is used before rotation (default: engine default, 45d). Must be < token_ttl"
-  type        = number
-  default     = null
-}
@@ -315,106 +315,6 @@ variable "litellm_secret_backend_role" {
  default = {}
 }

-variable "plugins" {
-  description = "Map of plugins to import (register) in the catalog, keyed by catalog name"
-  type = map(object({
-    name    = string
-    type    = optional(string, "secret")
-    command = optional(string)
-    sha256  = string
-    version = optional(string)
-  }))
-  default = {}
-}
-
-variable "gpg_secret_backend" {
-  description = "Map of GPG/OpenPGP secret engines to mount (path => registered plugin + description). The plugin is registered separately via config/plugins."
-  type = map(object({
-    plugin      = optional(string, "vault-plugin-secrets-gpg")
-    description = optional(string)
-  }))
-  default = {}
-}
-
-variable "gpg_key" {
-  description = "Map of OpenPGP keys to manage in a gpg engine mount"
-  type = map(object({
-    name                   = string
-    backend                = string
-    algorithm              = optional(string, "rsa-3072")
-    identity               = optional(string)
-    exportable             = optional(bool, false)
-    deletion_allowed       = optional(bool, false)
-    min_decryption_version = optional(number)
-  }))
-  default = {}
-}
-
-variable "rancher_secret_backend" {
-  description = "Map of rancher token secret engines to create (mount + config)"
-  type = map(object({
-    plugin                  = optional(string, "vault-plugin-secrets-rancher")
-    description             = optional(string)
-    rancher_url             = string
-    ca_cert                 = optional(string)
-    tls_skip_verify         = optional(bool, false)
-    request_timeout_seconds = optional(number, 30)
-  }))
-  default = {}
-}
-
-variable "rancher_secret_backend_service_account" {
-  description = "Map of seeded, auto-rotated rancher service-account tokens (seed token read from KV)"
-  type = map(object({
-    name            = string
-    backend         = string
-    token_ttl       = optional(number)
-    rotation_period = optional(number)
-  }))
-  default = {}
-}
-
-variable "rancher_secret_backend_role" {
-  description = "Map of rancher token-minting roles to create"
-  type = map(object({
-    name            = string
-    backend         = string
-    service_account = string
-    cluster_name    = optional(string)
-    description     = optional(string)
-    ttl             = optional(number)
-    max_ttl         = optional(number)
-  }))
-  default = {}
-}
-
-variable "gitea_secret_backend" {
-  description = "Map of gitea token secret engines to create (mount + config; seeded admin creds read from KV)"
-  type = map(object({
-    plugin                  = optional(string, "vault-plugin-secrets-gitea")
-    description             = optional(string)
-    gitea_url               = string
-    ca_cert                 = optional(string)
-    tls_skip_verify         = optional(bool, false)
-    request_timeout_seconds = optional(number, 30)
-  }))
-  default = {}
-}
-
-variable "gitea_secret_backend_role" {
-  description = "Map of gitea token-minting roles to create"
-  type = map(object({
-    name              = string
-    backend           = string
-    username          = string
-    scopes            = list(string)
-    token_name_prefix = optional(string)
-    ttl               = optional(number)
-    max_ttl           = optional(number)
-  }))
-  default = {}
-}
-
 variable "policy_auth_map" {
  description = "Map of auth mounts -> auth roles -> policy names"
  type        = map(map(list(string)))
@@ -1,14 +0,0 @@
-# Allow the terragrunt-enc runner to generate credentials for the
-# terraform-enc role in consul (used to lock/write its terragrunt state under
-# infra/terraform/enc/ on the consul backend).
---
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-enc"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_enc
-  k8s/au/syd1:
-    - woodpecker_terraform_enc
@@ -1,11 +0,0 @@
---
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-rancher"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_rancher
-  k8s/au/syd1:
-    - woodpecker_terraform_rancher
@@ -1,35 +0,0 @@
-# Allow the vault deployer to import the gpg plugin and manage its OpenPGP keys.
-#
-# terraform-vault registers the plugin itself (vault_plugin -> sys/plugins/catalog,
-# a sudo-protected path) and manages keys via the gpgvaultsecret provider, so the
-# deployer needs catalog access on top of the mount access it already has
-# (sys/mounts/*). Without this, apply 403s on the plugin registration and on
-# gpg/keys writes.
---
-rules:
-  # Import / register (and deregister) the gpg plugin in the catalog.
-  - path: "sys/plugins/catalog/secret/vault-plugin-secrets-gpg"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - sudo
-  # Manage keys (create/rotate/config/delete) in the gpg mount.
-  - path: "gpg/keys/*"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - list
-  - path: "gpg/keys"
-    capabilities:
-      - read
-      - list
-
-auth:
-  approle:
-    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -1,14 +0,0 @@
-# Allow the terragrunt-enc runner to read the encapi environment secret
-# (ENCAPI_WRITE_TOKEN), so `make apply` can write ENC data (statuses, roles,
-# nodes) to encapi via the encapi Terraform provider.
---
-rules:
-  - path: "kv/data/kubernetes/namespace/encapi/default/environment"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_enc
-  k8s/au/syd1:
-    - woodpecker_terraform_enc
@@ -1,18 +0,0 @@
-# Allow the Terraform Rancher runner to read:
-#  - its own Rancher admin API token (rancher2 provider auth), and
-#  - the OAuth2/OIDC client secret backing the Rancher keycloakoidc AuthConfig
-#    (same secret Authentik sets on the provider).
---
-rules:
-  - path: "kv/data/service/terraform/rancher"
-    capabilities:
-      - read
-  - path: "kv/data/kubernetes/namespace/cattle-system/default/oauth-credentials"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_rancher
-  k8s/au/syd1:
-    - woodpecker_terraform_rancher
@@ -1,45 +0,0 @@
-# Allow the vault deployer to manage the rancher secrets engine: its connection
-# config, seeded (auto-rotated) service-account tokens, and token-minting roles.
-#
-# Scoped to rancher/* only. The plugin-catalog grant needed to import the plugin
-# lives under policies/sys/plugins/catalog/ so a code owner of this policy path
-# cannot grant themselves access outside the rancher mount.
---
-rules:
-  # Engine connection config.
-  - path: "rancher/config"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-  # Seeded, auto-rotated service-account tokens (+ manual rotate).
-  - path: "rancher/service-accounts/*"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - list
-  - path: "rancher/service-accounts"
-    capabilities:
-      - read
-      - list
-  # Token-minting roles.
-  - path: "rancher/roles/*"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - list
-  - path: "rancher/roles"
-    capabilities:
-      - read
-      - list
-
-auth:
-  approle:
-    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -1,16 +0,0 @@
-# Allow the vault deployer to import (register/deregister) plugin in the catalog
---
-rules:
-  - path: "sys/plugins/catalog/*"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - sudo
-
-auth:
-  approle:
-    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/enc/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/rancher/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}