From f4522976656a30d33a239ca0a4fb0654a5abc1f3 Mon Sep 17 00:00:00 2001 From: jatcod3r Date: Tue, 4 Aug 2026 15:14:12 -0700 Subject: [PATCH 1/3] feat: add TF_VAR_namespace to all provisioners --- .../k8s/argo/coder-workspace/main.tf | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf b/infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf index e13be72..089402d 100644 --- a/infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf +++ b/infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf @@ -31,15 +31,9 @@ provider "coderd" { } locals { - release_name = "coder" - chart_name = "coder-provisioner" - namespace = "coder" - coder = { - CODER_URL = var.coder_access_url - CODER_PROMETHEUS_ENABLE = "true" - CODER_PROMETHEUS_COLLECT_AGENT_STATS = "true" - CODER_PROMETHEUS_COLLECT_DB_METRICS = "true" - } + release_name = "coder" + chart_name = "coder-provisioner" + namespace = "coder" node_selector = {} topology_spread = [] tolerations = [{ @@ -110,6 +104,13 @@ locals { namespace = "coder-ws-demo" } } + coder = { for k in keys(locals.coder-ws) : k => { + CODER_URL = var.coder_access_url + CODER_PROMETHEUS_ENABLE = "true" + CODER_PROMETHEUS_COLLECT_AGENT_STATS = "true" + CODER_PROMETHEUS_COLLECT_DB_METRICS = "true" + TF_VAR_namespace = k + } } } data "coderd_organization" "coder" { @@ -251,13 +252,13 @@ resource "kubernetes_manifest" "coder-provisioner" { "prometheus.io/scrape" = "true" "prometheus.io/port" = "2112" "checksum/config" = sha256(join(",", [ - jsonencode(local.coder), + jsonencode(local.coder[each.key]), jsonencode(sensitive(module.coder-provisioner[each.key].provisioner_key_secret)), jsonencode(module.oidc-role.role_arn) ])) } env = [ - for k, v in local.coder : { name = k, value = v } + for k, v in local.coder[each.key] : { name = k, value = v } ] volumeClaimTemplates = [{ metadata = { From c4d2a038b78c33a1fed5170cf465573a383108b6 Mon Sep 17 00:00:00 2001 From: jatcod3r Date: Wed, 5 Aug 2026 07:56:31 -0700 Subject: [PATCH 2/3] fix: adjust locals. to local. --- infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf b/infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf index 089402d..4b82f26 100644 --- a/infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf +++ b/infra/aws/us-east-2/k8s/argo/coder-workspace/main.tf @@ -104,7 +104,7 @@ locals { namespace = "coder-ws-demo" } } - coder = { for k in keys(locals.coder-ws) : k => { + coder = { for k in keys(local.coder-ws) : k => { CODER_URL = var.coder_access_url CODER_PROMETHEUS_ENABLE = "true" CODER_PROMETHEUS_COLLECT_AGENT_STATS = "true" From a3339fefc1d05ed2512e80a462c06aa6fa69ba5a Mon Sep 17 00:00:00 2001 From: jatcod3r Date: Wed, 5 Aug 2026 08:48:21 -0700 Subject: [PATCH 3/3] fix: increase token lifetime for GH actions --- infra/aws/us-east-2/k8s/argo/coder-server/main.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/infra/aws/us-east-2/k8s/argo/coder-server/main.tf b/infra/aws/us-east-2/k8s/argo/coder-server/main.tf index 7200834..eaea7ee 100644 --- a/infra/aws/us-east-2/k8s/argo/coder-server/main.tf +++ b/infra/aws/us-east-2/k8s/argo/coder-server/main.tf @@ -119,6 +119,8 @@ locals { CODER_QUIET_HOURS_DEFAULT_SCHEDULE = "CRON_TZ=America/Los_Angeles 50 23 * * *" CODER_ALLOW_CUSTOM_QUIET_HOURS = "false" CODER_EXPERIMENTS = join(",", []) + CODER_MAX_TOKEN_LIFETIME = "876600h0m0s" + CODER_MAX_ADMIN_TOKEN_LIFETIME = "8766h0m0s" # 1 year CODER_PROMETHEUS_ENABLE = "true" CODER_PROMETHEUS_COLLECT_AGENT_STATS = "true"