add: code-server

ericpaulsen · ericpaulsen · commit e7c0d547cb29 · 2022-08-22T17:08:56.000-05:00
diff --git a/examples/templates/kubernetes-multi-service/README.md b/examples/templates/kubernetes-multi-service/README.md
@@ -74,5 +74,5 @@ Then start the Coder host with `serviceAccountName: coder` in the pod spec.
 
 ## Persistence
 
-Each container in this Kubernetes pod example will have their `/home/coder` directory
-persisted via the attached PersistentVolumeClaim.
+The `/home/coder` directory in this example is persisted via the attached PersistentVolumeClaim.
+Any data saved outside of this directory will be wiped when the workspace stops.
diff --git a/examples/templates/kubernetes-multi-service/main.tf b/examples/templates/kubernetes-multi-service/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.10"
+      version = "~> 2.12.1"
     }
   }
 }
@@ -29,7 +29,7 @@ variable "workspaces_namespace" {
   type        = string
   sensitive   = true
   description = "The namespace to create workspaces in (must exist prior to creating workspaces)"
-  default     = "coder-workspaces"
+  default     = "coder-workspace"
 }
 
 variable "disk_size" {
@@ -45,19 +45,25 @@ provider "kubernetes" {
 
 data "coder_workspace" "me" {}
 
-resource "coder_agent" "go" {
+resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
-}
+  startup_script = <<EOT
+    #!/bin/bash
 
-resource "coder_agent" "java" {
-  os   = "linux"
-  arch = "amd64"
+    # install and start code-server
+    curl -fsSL https://code-server.dev/install.sh | sh  | tee code-server-install.log
+    code-server --auth none --port 13337 | tee code-server-install.log &
+  EOT
 }
 
-resource "coder_agent" "ubuntu" {
-  os   = "linux"
-  arch = "amd64"
+# code-server
+resource "coder_app" "code-server" {
+  agent_id      = coder_agent.main.id
+  name          = "code-server"
+  icon          = "/icon/code.svg"
+  url           = "http://localhost:13337?folder=/home/coder"
+  relative_path = true
 }
 
 resource "kubernetes_pod" "main" {
@@ -67,92 +73,36 @@ resource "kubernetes_pod" "main" {
     namespace = var.workspaces_namespace
   }
   spec {
-    container {
-      name    = "go"
-      image   = "codercom/enterprise-golang:ubuntu"
-      command = ["sh", "-c", coder_agent.go.init_script]
-      security_context {
-        run_as_user = "1000"
-      }
-      env {
-        name  = "CODER_AGENT_TOKEN"
-        value = coder_agent.go.token
-      }
-      volume_mount {
-        mount_path = "/home/coder"
-        name       = "go-home-directory"
-      }
-    }
-    volume {
-      name = "go-home-directory"
-      persistent_volume_claim {
-        claim_name = kubernetes_persistent_volume_claim.go-home-directory.metadata.0.name
-      }
+    security_context {
+      run_as_user = "1000"
+      fs_group    = "1000"
     }
     container {
-      name    = "java"
-      image   = "codercom/enterprise-java:ubuntu"
-      command = ["sh", "-c", coder_agent.java.init_script]
-      security_context {
-        run_as_user = "1000"
-      }
-      env {
-        name  = "CODER_AGENT_TOKEN"
-        value = coder_agent.java.token
-      }
-      volume_mount {
-        mount_path = "/home/coder"
-        name       = "java-home-directory"
-      }
-    }
-    volume {
-      name = "java-home-directory"
-      persistent_volume_claim {
-        claim_name = kubernetes_persistent_volume_claim.java-home-directory.metadata.0.name
-      }
-    }
-    container {
-      name    = "ubuntu"
+      name    = "dev"
       image   = "codercom/enterprise-base:ubuntu"
-      command = ["sh", "-c", coder_agent.ubuntu.init_script]
+      command = ["sh", "-c", coder_agent.main.init_script]
       security_context {
         run_as_user = "1000"
       }
       env {
         name  = "CODER_AGENT_TOKEN"
-        value = coder_agent.ubuntu.token
+        value = coder_agent.main.token
       }
       volume_mount {
         mount_path = "/home/coder"
-        name       = "ubuntu-home-directory"
+        name       = "home-directory"
       }
     }
     volume {
-      name = "ubuntu-home-directory"
+      name = "home-directory"
       persistent_volume_claim {
-        claim_name = kubernetes_persistent_volume_claim.ubuntu-home-directory.metadata.0.name
-      }
-    }
-
-  }
-}
-
-resource "kubernetes_persistent_volume_claim" "go-home-directory" {
-  metadata {
-    name      = "home-coder-go-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
-    namespace = var.workspaces_namespace
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "${var.disk_size}Gi"
+        claim_name = kubernetes_persistent_volume_claim.home-directory.metadata.0.name
       }
     }
   }
 }
 
-resource "kubernetes_persistent_volume_claim" "java-home-directory" {
+resource "kubernetes_persistent_volume_claim" "home-directory" {
   metadata {
     name      = "home-coder-java-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
     namespace = var.workspaces_namespace
@@ -166,18 +116,3 @@ resource "kubernetes_persistent_volume_claim" "java-home-directory" {
     }
   }
 }
-
-resource "kubernetes_persistent_volume_claim" "ubuntu-home-directory" {
-  metadata {
-    name      = "home-coder-ubuntu-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
-    namespace = var.workspaces_namespace
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "${var.disk_size}Gi"
-      }
-    }
-  }
-}
