feat: add plan workflow

- update makefile to enable kubernetes auth or roleid auth - add plan workflow - update all policies to allow the terraform-vault kubernetes role
2026-05-21 23:33:15 +10:00
41 changed files with 4 additions and 295 deletions
@@ -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
@@ -3,7 +3,7 @@ when:

 steps:
  - name: plan
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
+    image: git.unkin.net/unkin/almalinux9-opentofu:20260308
    environment:
      VAULT_AUTH_METHOD: kubernetes
    commands:
@@ -3,7 +3,7 @@ when:

 steps:
  - name: pre-commit
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
+    image: git.unkin.net/unkin/almalinux9-opentofu:20260308
    commands:
      - uvx pre-commit run --all-files
    backend_options:
@@ -13,7 +13,7 @@ define vault_env
 	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 CONSUL_HTTP_TOKEN=$$(vault read -format=json consul_root/au/syd1/creds/terraform-vault | jq '.data.token')
 endef

 init:
@@ -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,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,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-artifactapi
-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-authentik
-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-git
-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-prowlarr
-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-radarr
-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-sonarr
-bound_service_account_namespaces:
-  - woodpecker
-token_ttl: 600
-token_max_ttl: 600
-audience: https://kubernetes.default.svc.cluster.local
@@ -4,4 +4,4 @@ bound_service_account_namespaces:
  - woodpecker
 token_ttl: 600
 token_max_ttl: 600
-audience: https://kubernetes.default.svc.cluster.local
+audience: vault
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-artifactapi
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-authentik
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-git
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-prowlarr
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-radarr
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-sonarr
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -21,5 +21,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,8 +6,5 @@ rules:
      - read

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

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

 auth:
-  approle:
-    - terraform_sonarr
  k8s/au/syd1:
    - media-apps
-    - woodpecker_terraform_sonarr
@@ -1,11 +0,0 @@
---
-rules:
-  - path: "kv/data/service/woodpecker/tokens/gitadmin"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_git
-  k8s/au/syd1:
-    - woodpecker_terraform_git
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/artifactapi/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/authentik/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/git/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/prowlarr/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/radarr/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/sonarr/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}