From f50e1d5a9a804ccf789c077477017104a24e2595 Mon Sep 17 00:00:00 2001 From: Ari Croock Date: Thu, 8 Aug 2024 12:17:18 +0200 Subject: [PATCH] fix(examples): use more precise example kubernetes template labels (#14028) * fix: apply more specific selector labels to k8s example deployment template * fix: use immutable ids instead of names for persistent resources in k8s example template as per docs --- examples/templates/kubernetes/main.tf | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf index 87e62d5dc0..0ba6ba33b7 100644 --- a/examples/templates/kubernetes/main.tf +++ b/examples/templates/kubernetes/main.tf @@ -193,11 +193,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" @@ -228,11 +228,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 @@ -249,7 +249,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 { @@ -259,7 +266,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 {