Skip to content

feat(vault-token): add optional vault enterprise namespace variable #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 28, 2025
Merged

feat(vault-token): add optional vault enterprise namespace variable #108

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fad996
add optional vault namespace
moo-im-a-cow May 18, 2025
1287117
Merge branch 'main' into vault-token-namespace
moo-im-a-cow May 20, 2025
f41d470
update version
moo-im-a-cow May 23, 2025
b3040e4
Merge branch 'main' into vault-token-namespace
moo-im-a-cow May 23, 2025
26410e2
update version
moo-im-a-cow May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions registry/coder/modules/vault-token/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ variable "vault_token" {
}

module "vault" {
source = "registry.coder.com/coder/vault-token/coder"
version = "1.1.0"
agent_id = coder_agent.example.id
vault_token = var.token # optional
vault_addr = "https://vault.example.com"
source = "registry.coder.com/coder/vault-token/coder"
version = "1.1.1"
agent_id = coder_agent.example.id
vault_token = var.token # optional
vault_addr = "https://vault.example.com"
vault_namespace = "prod" # optional, vault enterprise only
}
```

Expand Down Expand Up @@ -74,7 +75,7 @@ variable "vault_token" {

module "vault" {
source = "registry.coder.com/coder/vault-token/coder"
version = "1.1.0"
version = "1.1.1"
agent_id = coder_agent.example.id
vault_addr = "https://vault.example.com"
vault_token = var.token
Expand Down
12 changes: 12 additions & 0 deletions registry/coder/modules/vault-token/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ variable "vault_token" {
sensitive = true
default = null
}
variable "vault_namespace" {
type = string
description = "The Vault namespace to use."
default = null
}

variable "vault_cli_version" {
type = string
Expand Down Expand Up @@ -62,3 +67,10 @@ resource "coder_env" "vault_token" {
name = "VAULT_TOKEN"
value = var.vault_token
}

resource "coder_env" "vault_namespace" {
count = var.vault_namespace != null ? 1 : 0
agent_id = var.agent_id
name = "VAULT_NAMESPACE"
value = var.vault_namespace
}