From 97be93a9ffbb72a68254caec97e9a1fa0c963cb9 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 6 Jul 2026 22:06:48 +1000 Subject: [PATCH 1/7] authentik: add Grafana OAuth2/OIDC provider + application Adds an OIDC provider + application so the in-cluster Grafana (grafana.k8s.syd1.au.unkin.net) can authenticate users against Authentik. Extends the oauth2 module so provider config stays declarative and secret-free: - Resolve authorization/invalidation flows by slug (data.authentik_flow) and scope mappings by managed identifier (data.authentik_property_mapping_provider_scope). - Read client_secret from Vault kv-v2 (data.vault_kv_secret_v2) instead of committing it; adds the hashicorp/vault provider (auth via VAULT_ADDR/ VAULT_TOKEN from the Makefile). - Support allowed_redirect_uris on the oauth2 provider. config/providers_oauth2/grafana.yaml wires client_id `grafana`, the openid/email/profile scopes, the login/generic_oauth redirect URI, and points client_secret at kv/kubernetes/namespace/grafana/default/oauth-credentials. --- config/providers_oauth2/grafana.yaml | 17 ++++++++++++++ environments/root.hcl | 8 +++++++ modules/authentik/.terraform.lock.hcl | 23 +++++++++++++++++++ modules/authentik/main.tf | 32 +++++++++++++++++++++++---- modules/authentik/variables.tf | 25 +++++++++++++++------ modules/authentik/versions.tf | 4 ++++ 6 files changed, 98 insertions(+), 11 deletions(-) create mode 100644 config/providers_oauth2/grafana.yaml diff --git a/config/providers_oauth2/grafana.yaml b/config/providers_oauth2/grafana.yaml new file mode 100644 index 0000000..307d2f8 --- /dev/null +++ b/config/providers_oauth2/grafana.yaml @@ -0,0 +1,17 @@ +# OAuth2/OIDC provider + application for the in-cluster Grafana +# (grafana.k8s.syd1.au.unkin.net). client_secret is read from Vault, not committed. +name: Grafana +authorization_flow: default-provider-authorization-implicit-consent +invalidation_flow: default-provider-invalidation-flow +client_type: confidential +client_id: grafana +client_secret_vault: + mount: kv + path: kubernetes/namespace/grafana/default/oauth-credentials +scope_mappings: + - goauthentik.io/providers/oauth2/scope-openid + - goauthentik.io/providers/oauth2/scope-email + - goauthentik.io/providers/oauth2/scope-profile +redirect_uris: + - matching_mode: strict + url: https://grafana.k8s.syd1.au.unkin.net/login/generic_oauth diff --git a/environments/root.hcl b/environments/root.hcl index 8574f82..87559a2 100644 --- a/environments/root.hcl +++ b/environments/root.hcl @@ -7,6 +7,10 @@ provider "authentik" { token = var.authentik_token } +# Reads client secrets seeded in Vault (kv-v2). Auth via VAULT_ADDR + VAULT_TOKEN +# from the environment (set by the Makefile vault_env helper). +provider "vault" {} + variable "authentik_token" { type = string sensitive = true @@ -26,6 +30,10 @@ terraform { source = "goauthentik/authentik" version = "2026.5.0" } + vault = { + source = "hashicorp/vault" + version = ">= 4.0.0" + } } } EOF diff --git a/modules/authentik/.terraform.lock.hcl b/modules/authentik/.terraform.lock.hcl index 28423cf..825a7c6 100644 --- a/modules/authentik/.terraform.lock.hcl +++ b/modules/authentik/.terraform.lock.hcl @@ -21,3 +21,26 @@ provider "registry.opentofu.org/goauthentik/authentik" { "zh:eb9c1fd3020cf61e9b7a6a38d2965f4b521495a9928705e963459a4af857f97d", ] } + +provider "registry.opentofu.org/hashicorp/vault" { + version = "5.10.1" + constraints = ">= 4.0.0" + hashes = [ + "h1:wo5cTkl/1nlxMfdn1yEDIHNoRLMczuK6COH2Id4/zeY=", + "zh:0abf976c01f0c0732d0ccc6481e52008be5ee9c8e3d9b5eba0573c640fcf7019", + "zh:2aff4d7ee7ba9eb3de2cd5cda16ba92b4ec7a2b43232aec180984241a323b216", + "zh:2cc186fd0bfc44e100a22b0b40ae8ddcd0ec210a53c1da65d310ee758b1d2b08", + "zh:3f8fb8594736b34af4b26437dd4df4dd4042ad4905223995cfebb8a1f10682ec", + "zh:47fb41b18b74073f557dbcd6aad2183e416293405ccd70c0691a279cfe97f8cd", + "zh:517e2f2764d671c22d22def0384fdfc521b456458189189c0363375495d114dc", + "zh:5a49a2003636f2b8a547d494a6c06d43d62a68299775305408c52eff22b1c11f", + "zh:66d4e716920ada84b0c768f4aca4c8948388995462923349a01bd3818d82b618", + "zh:7599f652e89a3f18fa4b76a59d115cc63255cc36ce6b273850509ba25031abca", + "zh:9c3e38ae7e670de973b6255d7050f526cd2b3ca7c383d7ba7226fc204d97c507", + "zh:d04b046023fa9fd69def678f27e001c298ea34fc99ba51f835cda82e496fdb57", + "zh:d9acd8810f6660cd51bb4c25596632984ae18e93340c82a102d074c6eac95151", + "zh:e161bcb9a22607270b980eeff2ba693335fb62d6978516dff93dd4c91cda99b3", + "zh:ef47502f08cfcb5311b7b16a7905e0052bf28359e07cc00ed080ef454e0946cf", + "zh:f0640ddb52e7e90c5006ff571f6ad0554e593665320c764c57a3d8b7ec31b490", + ] +} diff --git a/modules/authentik/main.tf b/modules/authentik/main.tf index b5190e0..f6fc278 100644 --- a/modules/authentik/main.tf +++ b/modules/authentik/main.tf @@ -20,18 +20,42 @@ resource "authentik_provider_saml" "this" { signing_kp = each.value.signing_kp } +# Resolve oauth2 flows by slug and scope mappings by managed identifier, and +# read client secrets from Vault so nothing sensitive is committed. +data "authentik_flow" "oauth2_authorization" { + for_each = var.providers_oauth2 + slug = each.value.authorization_flow +} + +data "authentik_flow" "oauth2_invalidation" { + for_each = var.providers_oauth2 + slug = each.value.invalidation_flow +} + +data "authentik_property_mapping_provider_scope" "oauth2" { + for_each = { for k, v in var.providers_oauth2 : k => v if length(v.scope_mappings) > 0 } + managed_list = each.value.scope_mappings +} + +data "vault_kv_secret_v2" "oauth2" { + for_each = { for k, v in var.providers_oauth2 : k => v if v.client_secret_vault != null } + mount = each.value.client_secret_vault.mount + name = each.value.client_secret_vault.path +} + resource "authentik_provider_oauth2" "this" { for_each = var.providers_oauth2 name = each.value.name - authorization_flow = each.value.authorization_flow - invalidation_flow = each.value.invalidation_flow + authorization_flow = data.authentik_flow.oauth2_authorization[each.key].id + invalidation_flow = data.authentik_flow.oauth2_invalidation[each.key].id client_type = each.value.client_type client_id = each.value.client_id - client_secret = each.value.client_secret - property_mappings = each.value.property_mappings + client_secret = each.value.client_secret_vault != null ? data.vault_kv_secret_v2.oauth2[each.key].data["client_secret"] : null + property_mappings = try(data.authentik_property_mapping_provider_scope.oauth2[each.key].ids, []) signing_key = each.value.signing_key access_token_validity = each.value.access_token_validity + allowed_redirect_uris = each.value.redirect_uris } resource "authentik_provider_ldap" "this" { diff --git a/modules/authentik/variables.tf b/modules/authentik/variables.tf index 9095a19..6b497a0 100644 --- a/modules/authentik/variables.tf +++ b/modules/authentik/variables.tf @@ -24,13 +24,24 @@ variable "providers_saml" { variable "providers_oauth2" { type = map(object({ - name = string - authorization_flow = string - invalidation_flow = string - client_type = optional(string, "confidential") - client_id = string - client_secret = optional(string, null) - property_mappings = optional(list(string), []) + name = string + authorization_flow = string # flow slug, resolved to id via data.authentik_flow + invalidation_flow = string # flow slug, resolved to id via data.authentik_flow + client_type = optional(string, "confidential") + client_id = string + # client_secret is never committed. Point at a Vault kv-v2 secret whose + # `client_secret` key holds the value (seeded out of band); TF reads it. + client_secret_vault = optional(object({ + mount = string + path = string + }), null) + # Managed identifiers of scope property mappings (e.g. + # goauthentik.io/providers/oauth2/scope-openid). Resolved to ids. + scope_mappings = optional(list(string), []) + redirect_uris = optional(list(object({ + matching_mode = optional(string, "strict") + url = string + })), []) signing_key = optional(string, null) access_token_validity = optional(string, "minutes=10") })) diff --git a/modules/authentik/versions.tf b/modules/authentik/versions.tf index af40006..4f420de 100644 --- a/modules/authentik/versions.tf +++ b/modules/authentik/versions.tf @@ -5,5 +5,9 @@ terraform { source = "goauthentik/authentik" version = ">= 2026.5.0" } + vault = { + source = "hashicorp/vault" + version = ">= 4.0.0" + } } } From 3d7131032f546876492f045c273c165c79268edf Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 6 Jul 2026 23:08:03 +1000 Subject: [PATCH 2/7] ci: re-run plan after terraform-vault kv policy applied From d1aef45d1da91fa7202acea84fd569650c81ebe9 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 6 Jul 2026 23:12:43 +1000 Subject: [PATCH 3/7] fix: drop duplicate required_providers from generated backend.tf The module's versions.tf and the root.hcl-generated backend.tf both declared required_providers, which OpenTofu rejects ("A module may have only one required providers configuration"), so terragrunt init/plan failed. Keep them in the module's versions.tf (authentik + vault) and generate only the backend + provider blocks. --- environments/root.hcl | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/environments/root.hcl b/environments/root.hcl index 87559a2..955ce83 100644 --- a/environments/root.hcl +++ b/environments/root.hcl @@ -25,16 +25,8 @@ terraform { ca_file = "/etc/pki/tls/certs/ca-bundle.crt" } required_version = ">= 1.10" - required_providers { - authentik = { - source = "goauthentik/authentik" - version = "2026.5.0" - } - vault = { - source = "hashicorp/vault" - version = ">= 4.0.0" - } - } + # required_providers are declared in the module's versions.tf; declaring them + # here as well is a duplicate configuration (OpenTofu permits only one). } EOF } From 41cc0fce8bc5da959d260177211b0da7c1fea3a6 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 6 Jul 2026 23:17:37 +1000 Subject: [PATCH 4/7] ci: re-run plan on fixed head (duplicate required_providers resolved) From d96d36a0795d28a63e72817757ab11271e3d2caa Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 6 Jul 2026 23:32:21 +1000 Subject: [PATCH 5/7] makefile: source TF_VAR_authentik_token from vault (kv/service/terraform/authentik) The authentik provider needs a token but nothing supplied it, so plan failed with 'No value for required variable authentik_token'. Source it from Vault in vault_env like the consul creds, from the dedicated terraform-service path kv/service/terraform/authentik (field: token), overridable via AUTHENTIK_TOKEN_KV_* vars. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fe3ec71..7ba8788 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,10 @@ VAULT_AUTH_METHOD ?= approle VAULT_K8S_ROLE ?= woodpecker_terraform_authentik VAULT_K8S_MOUNT ?= auth/k8s/au/syd1 VAULT_K8S_JWT_PATH ?= /var/run/secrets/kubernetes.io/serviceaccount/token +# kv-v2 location of the Authentik API token used by the provider. +AUTHENTIK_TOKEN_KV_MOUNT ?= kv +AUTHENTIK_TOKEN_KV_PATH ?= service/terraform/authentik +AUTHENTIK_TOKEN_KV_FIELD ?= token define vault_env @export VAULT_ADDR="https://vault.service.consul:8200" && \ @@ -12,7 +16,8 @@ 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-authentik) + export CONSUL_HTTP_TOKEN=$$(vault read -field=token consul_root/au/syd1/creds/terraform-authentik) && \ + export TF_VAR_authentik_token=$$(vault kv get -mount=$(AUTHENTIK_TOKEN_KV_MOUNT) -field=$(AUTHENTIK_TOKEN_KV_FIELD) $(AUTHENTIK_TOKEN_KV_PATH)) endef init: From 93742883a5c096c9bfaef6396b7d19a7cdf54ccd Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 6 Jul 2026 23:43:16 +1000 Subject: [PATCH 6/7] fix: skip_child_token on vault provider The CI VAULT_TOKEN (short-lived k8s-auth role token) can't create child tokens, so the vault provider failed with 'failed to create limited child token: permission denied'. Use the token directly. --- environments/root.hcl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/environments/root.hcl b/environments/root.hcl index 955ce83..8667a77 100644 --- a/environments/root.hcl +++ b/environments/root.hcl @@ -8,8 +8,11 @@ provider "authentik" { } # Reads client secrets seeded in Vault (kv-v2). Auth via VAULT_ADDR + VAULT_TOKEN -# from the environment (set by the Makefile vault_env helper). -provider "vault" {} +# from the environment (set by the Makefile vault_env helper). skip_child_token +# is required because the short-lived CI token cannot create child tokens. +provider "vault" { + skip_child_token = true +} variable "authentik_token" { type = string From 0b1b67fbd5ca4a60638cdeab224ee22491249d3a Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 6 Jul 2026 23:44:04 +1000 Subject: [PATCH 7/7] ci: re-run after vault #82 applied (token + oauth read policy live)