From 0ee0a057d935aaf9590fccac98deace2ab42ecab Mon Sep 17 00:00:00 2001 From: Steve McMaster Date: Thu, 3 Aug 2023 23:48:40 -0400 Subject: [PATCH] update --- base.tf.jinja | 191 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 142 insertions(+), 49 deletions(-) diff --git a/base.tf.jinja b/base.tf.jinja index 632543c..c11fd8b 100644 --- a/base.tf.jinja +++ b/base.tf.jinja @@ -3,11 +3,11 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.6.14" + version = "~> 0.11.0" } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 2.12.1" + version = "~> 2.22" } } } @@ -73,6 +73,32 @@ resource "coder_agent" "main" { {% endblock %} EOT {% endblock %} + + {% block metadata %} + metadata { + display_name = "CPU Usage" + key = "0_cpu_usage" + script = "coder stat cpu" + interval = 10 + timeout = 1 + } + + metadata { + display_name = "RAM Usage" + key = "1_ram_usage" + script = "coder stat mem" + interval = 10 + timeout = 1 + } + + metadata { + display_name = "Home Disk" + key = "3_home_disk" + script = "coder stat disk --path $${HOME}" + interval = 60 + timeout = 1 + } + {% endblock %} } {% endblock %} @@ -103,13 +129,27 @@ resource "kubernetes_persistent_volume_claim" "home" { metadata { name = "coder-${lower(data.coder_workspace.me.owner)}-${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/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 + } + annotations = { + "com.coder.user.email" = data.coder_workspace.me.owner_email + } } wait_until_bound = false spec { access_modes = ["ReadWriteOnce"] resources { requests = { - storage = "10Gi" + storage = "{{ coder_pvc_size|default("10", true) }}Gi" } } } @@ -117,60 +157,113 @@ resource "kubernetes_persistent_volume_claim" "home" { {% endblock %} {% block kubernetes_pod_main %} -resource "kubernetes_pod" "main" { +resource "kubernetes_deployment" "main" { count = data.coder_workspace.me.start_count + depends_on = [ + kubernetes_persistent_volume_claim.home + ] + wait_for_rollout = false metadata { name = "coder-${lower(data.coder_workspace.me.owner)}-${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/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 + } + annotations = { + "com.coder.user.email" = data.coder_workspace.me.owner_email + } } + spec { - {% block kubernetes_pod_main_security_context %} - security_context { - run_as_user = "{{ coder_user_uid|default("1000", true) }}" - fs_group = "{{ coder_user_gid|default("1000", true) }}" - } - {% endblock %} - - {% block kubernetes_pod_main_container %} - container { - name = "dev" - image = "{{image}}" - {% block kubernetes_pod_main_command %} - command = ["bash", "-c", coder_agent.main.init_script] - {% endblock %} - - {% block kubernetes_pod_main_container_security_context %} - security_context { - run_as_user = "{{ coder_user_uid|default("1000", true) }}" - } - {% endblock %} - - {% block kubernetes_pod_main_env %} - env { - name = "CODER_AGENT_TOKEN" - value = coder_agent.main.token - } - {% endblock %} - - {% block kubernetes_pod_main_volume_mount %} - volume_mount { - mount_path = "/home/coder" - name = "home" - read_only = false - } - {% endblock %} - } - {% endblock %} - - {% block kubernetes_pod_main_volume %} - volume { - name = "home" - persistent_volume_claim { - claim_name = kubernetes_persistent_volume_claim.home.metadata.0.name - read_only = false + # replicas = data.coder_workspace.me.start_count + replicas = 1 + selector { + match_labels = { + "app.kubernetes.io/name" = "coder-workspace" + } + } + + template { + metadata { + labels = { + "app.kubernetes.io/name" = "coder-workspace" + } + } + + spec { + {% block kubernetes_pod_main_security_context %} + security_context { + run_as_user = "{{ coder_user_uid|default("1000", true) }}" + fs_group = "{{ coder_user_gid|default("1000", true) }}" + } + {% endblock %} + + {% block kubernetes_pod_main_container %} + container { + name = "dev" + image = "{{image}}" + {% block kubernetes_pod_main_command %} + command = ["bash", "-c", coder_agent.main.init_script] + {% endblock %} + + {% block kubernetes_pod_main_container_security_context %} + security_context { + run_as_user = "{{ coder_user_uid|default("1000", true) }}" + } + {% endblock %} + + {% block kubernetes_pod_main_env %} + env { + name = "CODER_AGENT_TOKEN" + value = coder_agent.main.token + } + {% endblock %} + + {% block kubernetes_pod_resources %} + resources { + {% block kubernetes_pod_resources_requests %} + requests = { + "cpu" = "250m" + "memory" = "512Mi" + } + {% endblock %} + {% block kubernetes_pod_resources_limits %} + limits = { + "cpu" = "2" + "memory" = "2Gi" + } + {% endblock %} + } + {% endblock %} + + {% block kubernetes_pod_main_volume_mount %} + volume_mount { + mount_path = "/home/coder" + name = "home" + read_only = false + } + {% endblock %} + } + {% endblock %} + + {% block kubernetes_pod_main_volume %} + volume { + name = "home" + persistent_volume_claim { + claim_name = kubernetes_persistent_volume_claim.home.metadata.0.name + read_only = false + } + } + {% endblock %} } } - {% endblock %} } } {% endblock %}