From 5123b2463484c9a7e6b5490061220d90d37b8198 Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Sun, 23 Mar 2025 23:43:24 +1000 Subject: [PATCH 1/2] chore(dogfood): update EU server from Helsinki to Falkenstein --- dogfood/coder-envbuilder/main.tf | 10 +++++++--- dogfood/coder/main.tf | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dogfood/coder-envbuilder/main.tf b/dogfood/coder-envbuilder/main.tf index 7d13c9887d26b..f407ee0c367cf 100644 --- a/dogfood/coder-envbuilder/main.tf +++ b/dogfood/coder-envbuilder/main.tf @@ -20,7 +20,9 @@ locals { docker_host = { "" = "tcp://dogfood-ts-cdr-dev.tailscale.svc.cluster.local:2375" "us-pittsburgh" = "tcp://dogfood-ts-cdr-dev.tailscale.svc.cluster.local:2375" - "eu-helsinki" = "tcp://reinhard-hel-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-jnb" = "tcp://greenhill-jnb-cdr-dev.tailscale.svc.cluster.local:2375" @@ -59,8 +61,10 @@ data "coder_parameter" "region" { value = "us-pittsburgh" } option { - icon = "/emojis/1f1eb-1f1ee.png" - name = "Helsinki" + icon = "/emojis/1f1e9-1f1ea.png" + name = "Falkenstein" + // For legacy reasons, this host is labelled `eu-helsinki` but it's + // actually in Germany now. value = "eu-helsinki" } option { diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf index 1679b59ea39f6..0ba438626b828 100644 --- a/dogfood/coder/main.tf +++ b/dogfood/coder/main.tf @@ -17,7 +17,9 @@ locals { docker_host = { "" = "tcp://dogfood-ts-cdr-dev.tailscale.svc.cluster.local:2375" "us-pittsburgh" = "tcp://dogfood-ts-cdr-dev.tailscale.svc.cluster.local:2375" - "eu-helsinki" = "tcp://reinhard-hel-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" @@ -64,8 +66,10 @@ data "coder_parameter" "region" { value = "us-pittsburgh" } option { - icon = "/emojis/1f1eb-1f1ee.png" - name = "Helsinki" + icon = "/emojis/1f1e9-1f1ea.png" + name = "Falkenstein" + // For legacy reasons, this host is labelled `eu-helsinki` but it's + // actually in Germany now. value = "eu-helsinki" } option { From f9d45ffabb8b9695369203ab49376a26dfc85253 Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Mon, 24 Mar 2025 01:15:34 +1000 Subject: [PATCH 2/2] fmt --- dogfood/coder-envbuilder/main.tf | 12 ++++++------ dogfood/coder/main.tf | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dogfood/coder-envbuilder/main.tf b/dogfood/coder-envbuilder/main.tf index f407ee0c367cf..adf52cc180172 100644 --- a/dogfood/coder-envbuilder/main.tf +++ b/dogfood/coder-envbuilder/main.tf @@ -22,10 +22,10 @@ locals { "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-jnb" = "tcp://greenhill-jnb-cdr-dev.tailscale.svc.cluster.local:2375" + "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-jnb" = "tcp://greenhill-jnb-cdr-dev.tailscale.svc.cluster.local:2375" } envbuilder_repo = "ghcr.io/coder/envbuilder-preview" @@ -61,8 +61,8 @@ data "coder_parameter" "region" { value = "us-pittsburgh" } option { - icon = "/emojis/1f1e9-1f1ea.png" - name = "Falkenstein" + icon = "/emojis/1f1e9-1f1ea.png" + name = "Falkenstein" // For legacy reasons, this host is labelled `eu-helsinki` but it's // actually in Germany now. value = "eu-helsinki" diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf index 0ba438626b828..6f1eaff1aafeb 100644 --- a/dogfood/coder/main.tf +++ b/dogfood/coder/main.tf @@ -19,10 +19,10 @@ locals { "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" + "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/") @@ -66,8 +66,8 @@ data "coder_parameter" "region" { value = "us-pittsburgh" } option { - icon = "/emojis/1f1e9-1f1ea.png" - name = "Falkenstein" + icon = "/emojis/1f1e9-1f1ea.png" + name = "Falkenstein" // For legacy reasons, this host is labelled `eu-helsinki` but it's // actually in Germany now. value = "eu-helsinki"