diff --git a/base.tf.j2 b/base.tf.j2 index 29c727d..15c693b 100644 --- a/base.tf.j2 +++ b/base.tf.j2 @@ -4,7 +4,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "~> 0.12.3" + version = ">= 2.4.0" } kubernetes = { source = "hashicorp/kubernetes" @@ -213,6 +213,10 @@ provider "coder" { data "coder_workspace" "me" {} {% endblock %} +{% block workspace_owner %} +data "coder_workspace_owner" "me" {} +{% endblock %} + {% block coder_agent %} resource "coder_agent" "main" { os = "linux" @@ -257,8 +261,8 @@ resource "coder_agent" "main" { [ ! -f ~/.profile ] && [ -f /etc/skel/.profile ] && cp /etc/skel/.profile $HOME [ ! -f ~/.bashrc ] && [ -f /etc/skel/.bashrc ] && cp /etc/skel/.bashrc $HOME - git config --global user.name "${data.coder_parameter.git_user_name.value == "" ? data.coder_workspace.me.owner : data.coder_parameter.git_user_name.value}" - git config --global user.email "${data.coder_parameter.git_email.value == "" ? data.coder_workspace.me.owner_email : data.coder_parameter.git_email.value}" + git config --global user.name "${data.coder_parameter.git_user_name.value == "" ? data.coder_workspace_owner.me.full_name : data.coder_parameter.git_user_name.value}" + git config --global user.email "${data.coder_parameter.git_email.value == "" ? data.coder_workspace_owner.me.email : data.coder_parameter.git_email.value}" {% endblock %} {% block post_startup_script_setup_home %} @@ -380,21 +384,21 @@ resource "coder_script" "{{ startup_script }}" { {% block home_volume %} resource "kubernetes_persistent_volume_claim" "home" { metadata { - name = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}-home" + name = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}-home" namespace = "coder" labels = { "app.kubernetes.io/name" = "coder-pvc" - "app.kubernetes.io/instance" = "coder-pvc-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}" + "app.kubernetes.io/instance" = "coder-pvc-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}" "app.kubernetes.io/part-of" = "coder" //Coder-specific labels. "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.me.owner_id - "com.coder.user.username" = data.coder_workspace.me.owner + "com.coder.user.id" = data.coder_workspace_owner.me.id + "com.coder.user.username" = data.coder_workspace_owner.me.name } annotations = { - "com.coder.user.email" = data.coder_workspace.me.owner_email + "com.coder.user.email" = data.coder_workspace_owner.me.email } } wait_until_bound = false @@ -418,20 +422,20 @@ resource "kubernetes_deployment" "main" { ] wait_for_rollout = false metadata { - name = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}" + name = "coder-${lower(data.coder_workspace_owner.me.full_name)}-${lower(data.coder_workspace.me.name)}" namespace = "coder" labels = { "app.kubernetes.io/name" = "coder-workspace" - "app.kubernetes.io/instance" = "coder-workspace-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}" + "app.kubernetes.io/instance" = "coder-workspace-${lower(data.coder_workspace_owner.me.full_name)}-${lower(data.coder_workspace.me.name)}" "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.me.owner_id - "com.coder.user.username" = data.coder_workspace.me.owner + "com.coder.user.id" = data.coder_workspace_owner.me.id + "com.coder.user.username" = data.coder_workspace_owner.me.full_name } annotations = { - "com.coder.user.email" = data.coder_workspace.me.owner_email + "com.coder.user.email" = data.coder_workspace_owner.me.email } }