From 37be42adfc4d31f6d9abe794dec0c7332b722404 Mon Sep 17 00:00:00 2001 From: Mark Milligan Date: Tue, 24 Jan 2023 03:11:16 +0000 Subject: [PATCH 1/4] chore: remove code-server release limitation and add image push policy --- examples/templates/kubernetes/main.tf | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf index 7c17c1a1ceaa6..ce27fdba85f8c 100644 --- a/examples/templates/kubernetes/main.tf +++ b/examples/templates/kubernetes/main.tf @@ -28,7 +28,7 @@ variable "use_kubeconfig" { variable "namespace" { type = string sensitive = true - description = "The namespace to create workspaces in (must exist prior to creating workspaces)" + description = "The Kubernetes namespace to create workspaces in (must exist prior to creating workspaces)" } variable "home_disk_size" { @@ -54,17 +54,9 @@ resource "coder_agent" "main" { startup_script = < Date: Sun, 29 Jan 2023 21:27:01 -0500 Subject: [PATCH 2/4] restore code-server changes --- examples/templates/kubernetes/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf index 5bedca384495a..73ae829510e3d 100644 --- a/examples/templates/kubernetes/main.tf +++ b/examples/templates/kubernetes/main.tf @@ -58,8 +58,8 @@ resource "coder_agent" "main" { set -e # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3 - code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & + curl -fsSL https://code-server.dev/install.sh | sh -s + code-server --auth none --port 13337 & EOT } From 73e7f59276192c95f4814f37816402ab5be315ad Mon Sep 17 00:00:00 2001 From: Mark Milligan Date: Sun, 29 Jan 2023 20:50:34 -0600 Subject: [PATCH 3/4] chore: remove spaces in pod space --- examples/templates/kubernetes/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf index 73ae829510e3d..d9de4f6ef9a72 100644 --- a/examples/templates/kubernetes/main.tf +++ b/examples/templates/kubernetes/main.tf @@ -136,10 +136,10 @@ resource "kubernetes_pod" "main" { fs_group = "1000" } container { - name = "dev" - image = "codercom/enterprise-base:ubuntu" + name = "dev" + image = "codercom/enterprise-base:ubuntu" image_pull_policy = "Always" - command = ["sh", "-c", coder_agent.main.init_script] + command = ["sh", "-c", coder_agent.main.init_script] security_context { run_as_user = "1000" } From d9e187bb37ec26ab5c8aea6d68affd02ce6a127c Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 30 Jan 2023 03:00:17 +0000 Subject: [PATCH 4/4] Format terraform --- examples/templates/kubernetes/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf index d9de4f6ef9a72..73ae829510e3d 100644 --- a/examples/templates/kubernetes/main.tf +++ b/examples/templates/kubernetes/main.tf @@ -136,10 +136,10 @@ resource "kubernetes_pod" "main" { fs_group = "1000" } container { - name = "dev" - image = "codercom/enterprise-base:ubuntu" + name = "dev" + image = "codercom/enterprise-base:ubuntu" image_pull_policy = "Always" - command = ["sh", "-c", coder_agent.main.init_script] + command = ["sh", "-c", coder_agent.main.init_script] security_context { run_as_user = "1000" }