From 2823590171a4d4ad33fe29564235c2d431b58160 Mon Sep 17 00:00:00 2001 From: Phorcys <57866459+phorcys420@users.noreply.github.com> Date: Tue, 5 Aug 2025 15:26:20 +0200 Subject: [PATCH] chore: move dogfood regions to a separate module --- dogfood/coder/main.tf | 20 ++++------------ dogfood/coder/modules/dogfood-regions/main.tf | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 dogfood/coder/modules/dogfood-regions/main.tf diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf index c9bd9cb9633c0..965a18b1ff976 100644 --- a/dogfood/coder/main.tf +++ b/dogfood/coder/main.tf @@ -22,19 +22,6 @@ module "large-5mb-module" { } locals { - // These are cluster service addresses mapped to Tailscale nodes. Ask Dean or - // Kyle for help. - docker_host = { - "" = "tcp://dogfood-ts-cdr-dev.tailscale.svc.cluster.local:2375" - "us-pittsburgh" = "tcp://dogfood-ts-cdr-dev.tailscale.svc.cluster.local:2375" - // For legacy reasons, this host is labelled `eu-helsinki` but it's - // actually in Germany now. - "eu-helsinki" = "tcp://katerose-fsn-cdr-dev.tailscale.svc.cluster.local:2375" - "ap-sydney" = "tcp://wolfgang-syd-cdr-dev.tailscale.svc.cluster.local:2375" - "sa-saopaulo" = "tcp://oberstein-sao-cdr-dev.tailscale.svc.cluster.local:2375" - "za-cpt" = "tcp://schonkopf-cpt-cdr-dev.tailscale.svc.cluster.local:2375" - } - repo_base_dir = data.coder_parameter.repo_base_dir.value == "~" ? "/home/coder" : replace(data.coder_parameter.repo_base_dir.value, "/^~\\//", "/home/coder/") repo_dir = replace(try(module.git-clone[0].repo_dir, ""), "/^~\\//", "/home/coder/") container_name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}" @@ -167,7 +154,6 @@ locals { ], ["us-pittsburgh"])[0] } - data "coder_parameter" "region" { type = "string" name = "Region" @@ -242,8 +228,12 @@ data "coder_parameter" "devcontainer_autostart" { mutable = true } +module "dogfood-regions" { + source = "./modules/dogfood-regions" +} + provider "docker" { - host = lookup(local.docker_host, data.coder_parameter.region.value) + host = lookup(module.dogfood-regions.docker_host, data.coder_parameter.region.value) } provider "coder" {} diff --git a/dogfood/coder/modules/dogfood-regions/main.tf b/dogfood/coder/modules/dogfood-regions/main.tf new file mode 100644 index 0000000000000..5c8f62d5873ec --- /dev/null +++ b/dogfood/coder/modules/dogfood-regions/main.tf @@ -0,0 +1,23 @@ +terraform { + required_providers { + coder = { + source = "coder/coder" + version = "~> 2.9" + } + } +} + +// These are cluster service addresses mapped to Tailscale nodes. Ask Dean or +// Kyle for help. +output "docker_host" { + value = { + "" = "tcp://dogfood-ts-cdr-dev.tailscale.svc.cluster.local:2375" + "us-pittsburgh" = "tcp://dogfood-ts-cdr-dev.tailscale.svc.cluster.local:2375" + // For legacy reasons, this host is labelled `eu-helsinki` but it's + // actually in Germany now. + "eu-helsinki" = "tcp://katerose-fsn-cdr-dev.tailscale.svc.cluster.local:2375" + "ap-sydney" = "tcp://wolfgang-syd-cdr-dev.tailscale.svc.cluster.local:2375" + "sa-saopaulo" = "tcp://oberstein-sao-cdr-dev.tailscale.svc.cluster.local:2375" + "za-cpt" = "tcp://schonkopf-cpt-cdr-dev.tailscale.svc.cluster.local:2375" + } +} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy