diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf index 649cc94c40a66..0cf38e585a605 100644 --- a/examples/templates/kubernetes/main.tf +++ b/examples/templates/kubernetes/main.tf @@ -190,11 +190,11 @@ resource "coder_app" "code-server" { resource "kubernetes_persistent_volume_claim" "home" { metadata { - name = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}-home" + name = "coder-${data.coder_workspace.me.id}-home" namespace = var.namespace labels = { "app.kubernetes.io/name" = "coder-pvc" - "app.kubernetes.io/instance" = "coder-pvc-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}" + "app.kubernetes.io/instance" = "coder-pvc-${data.coder_workspace.me.id}" "app.kubernetes.io/part-of" = "coder" //Coder-specific labels. "com.coder.resource" = "true" @@ -225,11 +225,11 @@ resource "kubernetes_deployment" "main" { ] wait_for_rollout = false metadata { - name = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}" + name = "coder-${data.coder_workspace.me.id}" namespace = var.namespace labels = { "app.kubernetes.io/name" = "coder-workspace" - "app.kubernetes.io/instance" = "coder-workspace-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}" + "app.kubernetes.io/instance" = "coder-workspace-${data.coder_workspace.me.id}" "app.kubernetes.io/part-of" = "coder" "com.coder.resource" = "true" "com.coder.workspace.id" = data.coder_workspace.me.id @@ -246,7 +246,14 @@ resource "kubernetes_deployment" "main" { replicas = 1 selector { match_labels = { - "app.kubernetes.io/name" = "coder-workspace" + "app.kubernetes.io/name" = "coder-workspace" + "app.kubernetes.io/instance" = "coder-workspace-${data.coder_workspace.me.id}" + "app.kubernetes.io/part-of" = "coder" + "com.coder.resource" = "true" + "com.coder.workspace.id" = data.coder_workspace.me.id + "com.coder.workspace.name" = data.coder_workspace.me.name + "com.coder.user.id" = data.coder_workspace_owner.me.id + "com.coder.user.username" = data.coder_workspace_owner.me.name } } strategy { @@ -256,7 +263,14 @@ resource "kubernetes_deployment" "main" { template { metadata { labels = { - "app.kubernetes.io/name" = "coder-workspace" + "app.kubernetes.io/name" = "coder-workspace" + "app.kubernetes.io/instance" = "coder-workspace-${data.coder_workspace.me.id}" + "app.kubernetes.io/part-of" = "coder" + "com.coder.resource" = "true" + "com.coder.workspace.id" = data.coder_workspace.me.id + "com.coder.workspace.name" = data.coder_workspace.me.name + "com.coder.user.id" = data.coder_workspace_owner.me.id + "com.coder.user.username" = data.coder_workspace_owner.me.name } } spec {