From 03dc33037fd1057ec138bff2a287f026afd81ff4 Mon Sep 17 00:00:00 2001 From: Steve McMaster Date: Fri, 4 Aug 2023 13:14:28 -0400 Subject: [PATCH] update --- base.tf.jinja | 88 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 11 deletions(-) diff --git a/base.tf.jinja b/base.tf.jinja index c11fd8b..feab9e6 100644 --- a/base.tf.jinja +++ b/base.tf.jinja @@ -14,6 +14,75 @@ terraform { {% endblock %} {% block parameters %} +{% block cpu_parameter %} +data "coder_parameter" "cpu" { + name = "cpu" + display_name = "CPU" + description = "The number of CPU cores" + default = "{{ coder_cpu|default("2", true) }}" + icon = "/icon/memory.svg" + mutable = true + option { + name = "2 Cores" + value = "2" + } + option { + name = "4 Cores" + value = "4" + } + option { + name = "6 Cores" + value = "6" + } + option { + name = "8 Cores" + value = "8" + } +} +{% endblock %} + +{% block memory_parameter %} +data "coder_parameter" "memory" { + name = "memory" + display_name = "Memory" + description = "The amount of memory in GB" + default = "{{ coder_memory|default("2", true) }}" + icon = "/icon/memory.svg" + mutable = true + option { + name = "2 GB" + value = "2" + } + option { + name = "4 GB" + value = "4" + } + option { + name = "6 GB" + value = "6" + } + option { + name = "8 GB" + value = "8" + } +} +{% endblock %} + +{% block home_disk_size_parameter %} +data "coder_parameter" "home_disk_size" { + name = "home_disk_size" + display_name = "Home disk size" + description = "The size of the home disk in GB" + default = "{{ coder_home_disk_size|default("10", true) }}" + type = "number" + icon = "/emojis/1f4be.png" + mutable = false + validation { + min = 1 + max = 99999 + } +} +{% endblock %} {% endblock %} {% block kubernetes %} @@ -46,12 +115,8 @@ resource "coder_agent" "main" { {% block startup_script_setup_home %} # home folder can be empty, so copying default bash settings - if [ ! -f ~/.profile ]; then - cp /etc/skel/.profile $HOME - fi - if [ ! -f ~/.bashrc ]; then - cp /etc/skel/.bashrc $HOME - fi + [ ! -f ~/.profile ] && [ -f /etc/skel/.profile ] && cp /etc/skel/.profile $HOME + [ ! -f ~/.bashrc ] && [ -f /etc/skel/.bashrc ] && cp /etc/skel/.bashrc $HOME {% endblock %} {% block post_startup_script_setup_home %} @@ -62,8 +127,8 @@ resource "coder_agent" "main" { {% block startup_script_install_code_server %} # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=$HOME/code-server --version 4.11.0 - $HOME/code-server/bin/code-server --auth none --port 13337 > $HOME/code-server.log 2>&1 & + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone + $HOME/.local/bin/code-server --auth none --port 13337 > $HOME/code-server.log 2>&1 & {% endblock %} {% block post_startup_script_install_code_server %} @@ -149,7 +214,8 @@ resource "kubernetes_persistent_volume_claim" "home" { access_modes = ["ReadWriteOnce"] resources { requests = { - storage = "{{ coder_pvc_size|default("10", true) }}Gi" + # storage = "{{ coder_pvc_size|default("10", true) }}Gi" + storage = "${data.coder_parameter.home_disk_size.value}Gi" } } } @@ -236,8 +302,8 @@ resource "kubernetes_deployment" "main" { {% endblock %} {% block kubernetes_pod_resources_limits %} limits = { - "cpu" = "2" - "memory" = "2Gi" + "cpu" = "${data.coder_parameter.cpu.value}" + "memory" = "${data.coder_parameter.memory.value}Gi" } {% endblock %} }