Skip to content

Commit bf1ea39

Browse files
committed
fix: use immutable ids instead of names for persistent resources in k8s example template as per docs
1 parent 98eaf34 commit bf1ea39

File tree

1 file changed

+6
-10
lines changed
  • examples/templates/kubernetes

1 file changed

+6
-10
lines changed

examples/templates/kubernetes/main.tf

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ provider "kubernetes" {
103103
data "coder_workspace" "me" {}
104104
data "coder_workspace_owner" "me" {}
105105

106-
locals {
107-
workspace_instance = "${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}"
108-
}
109-
110106
resource "coder_agent" "main" {
111107
os = "linux"
112108
arch = "amd64"
@@ -194,11 +190,11 @@ resource "coder_app" "code-server" {
194190

195191
resource "kubernetes_persistent_volume_claim" "home" {
196192
metadata {
197-
name = "coder-${local.workspace_instance}-home"
193+
name = "coder-${data.coder_workspace.me.id}-home"
198194
namespace = var.namespace
199195
labels = {
200196
"app.kubernetes.io/name" = "coder-pvc"
201-
"app.kubernetes.io/instance" = "coder-pvc-${local.workspace_instance}"
197+
"app.kubernetes.io/instance" = "coder-pvc-${data.coder_workspace.me.id}"
202198
"app.kubernetes.io/part-of" = "coder"
203199
//Coder-specific labels.
204200
"com.coder.resource" = "true"
@@ -229,11 +225,11 @@ resource "kubernetes_deployment" "main" {
229225
]
230226
wait_for_rollout = false
231227
metadata {
232-
name = "coder-${local.workspace_instance}"
228+
name = "coder-${data.coder_workspace.me.id}"
233229
namespace = var.namespace
234230
labels = {
235231
"app.kubernetes.io/name" = "coder-workspace"
236-
"app.kubernetes.io/instance" = "coder-workspace-${local.workspace_instance}"
232+
"app.kubernetes.io/instance" = "coder-workspace-${data.coder_workspace.me.id}"
237233
"app.kubernetes.io/part-of" = "coder"
238234
"com.coder.resource" = "true"
239235
"com.coder.workspace.id" = data.coder_workspace.me.id
@@ -251,7 +247,7 @@ resource "kubernetes_deployment" "main" {
251247
selector {
252248
match_labels = {
253249
"app.kubernetes.io/name" = "coder-workspace"
254-
"app.kubernetes.io/instance" = "coder-workspace-${local.workspace_instance}"
250+
"app.kubernetes.io/instance" = "coder-workspace-${data.coder_workspace.me.id}"
255251
"app.kubernetes.io/part-of" = "coder"
256252
"com.coder.resource" = "true"
257253
"com.coder.workspace.id" = data.coder_workspace.me.id
@@ -268,7 +264,7 @@ resource "kubernetes_deployment" "main" {
268264
metadata {
269265
labels = {
270266
"app.kubernetes.io/name" = "coder-workspace"
271-
"app.kubernetes.io/instance" = "coder-workspace-${local.workspace_instance}"
267+
"app.kubernetes.io/instance" = "coder-workspace-${data.coder_workspace.me.id}"
272268
"app.kubernetes.io/part-of" = "coder"
273269
"com.coder.resource" = "true"
274270
"com.coder.workspace.id" = data.coder_workspace.me.id

0 commit comments

Comments
 (0)