selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(examples): remove deprecated startup_script_timeout and shutdown_script_timeout (#12104) 

Removes deprecated startup_script_timeout and shutdown_script_timeout from our example templates.

Co-authored-by: Muhammad Atif Ali <atif@coder.com>
This commit is contained in:
Cian Johnston 2024-02-12 14:29:41 +00:00 committed by GitHub
parent 3e68650791
commit 1cc51b009a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 40 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/pr-deployments/template/main.tf vendored
View File

@ -88,10 +88,9 @@ provider "kubernetes" {
data "coder_workspace" "me" {}
resource "coder_agent" "main" {
os = "linux"
arch = "amd64"
startup_script_timeout = 180
startup_script = <<-EOT
os = "linux"
arch = "amd64"
startup_script = <<-EOT
set -e
# install and start code-server

3
dogfood/main.tf
View File

@ -259,8 +259,7 @@ resource "coder_agent" "dev" {
timeout = 5
}
startup_script_timeout = 60
startup_script = <<-EOT
startup_script = <<-EOT
set -eux -o pipefail
# Allow synchronization between scripts.

7
examples/jfrog/docker/main.tf
View File

@ -59,10 +59,9 @@ resource "artifactory_scoped_token" "me" {
}
resource "coder_agent" "main" {
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script_timeout = 180
startup_script = <<-EOT
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script = <<-EOT
set -e
# install and start code-server

7
examples/parameters/main.tf
View File

@ -23,10 +23,9 @@ data "coder_workspace" "me" {
}
resource "coder_agent" "main" {
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script_timeout = 180
startup_script = <<-EOT
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script = <<-EOT
set -e
# install and start code-server

11
examples/templates/aws-linux/main.tf
View File

@ -157,12 +157,11 @@ data "aws_ami" "ubuntu" {
}
resource "coder_agent" "dev" {
count = data.coder_workspace.me.start_count
arch = "amd64"
auth = "aws-instance-identity"
os = "linux"
startup_script_timeout = 180
startup_script = <<-EOT
count = data.coder_workspace.me.start_count
arch = "amd64"
auth = "aws-instance-identity"
os = "linux"
startup_script = <<-EOT
set -e
# install and start code-server

9
examples/templates/devcontainer-docker/main.tf
View File

@ -19,17 +19,16 @@ data "coder_workspace" "me" {
}
resource "coder_agent" "main" {
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script_timeout = 180
startup_script = <<-EOT
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script = <<-EOT
set -e
# install and start code-server
curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0
/tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
EOT
dir = "/worskpaces"
dir = "/worskpaces"
# These environment variables allow you to make Git commits right away after creating a
# workspace. Note that they take precedence over configuration defined in ~/.gitconfig!

9
examples/templates/devcontainer-kubernetes/main.tf
View File

@ -44,17 +44,16 @@ data "coder_workspace" "me" {
}
resource "coder_agent" "main" {
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script_timeout = 180
startup_script = <<-EOT
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script = <<-EOT
set -e
# install and start code-server
curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0
/tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
EOT
dir = "/workspaces"
dir = "/workspaces"
# These environment variables allow you to make Git commits right away after creating a
# workspace. Note that they take precedence over configuration defined in ~/.gitconfig!

7
examples/templates/docker/main.tf
View File

@ -23,10 +23,9 @@ data "coder_workspace" "me" {
}
resource "coder_agent" "main" {
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script_timeout = 180
startup_script = <<-EOT
arch = data.coder_provisioner.me.arch
os = "linux"
startup_script = <<-EOT
set -e
# install and start code-server

9
examples/templates/gcp-linux/main.tf
View File

@ -73,11 +73,10 @@ resource "google_compute_disk" "root" {
}
resource "coder_agent" "main" {
auth = "google-instance-identity"
arch = "amd64"
os = "linux"
startup_script_timeout = 180
startup_script = <<-EOT
auth = "google-instance-identity"
arch = "amd64"
os = "linux"
startup_script = <<-EOT
set -e
# install and start code-server

10
examples/templates/gcp-vm-container/main.tf
View File

@ -63,12 +63,10 @@ data "coder_workspace" "me" {
}
resource "coder_agent" "main" {
auth = "google-instance-identity"
arch = "amd64"
os = "linux"
startup_script_timeout = 180
startup_script = <<-EOT
auth = "google-instance-identity"
arch = "amd64"
os = "linux"
startup_script = <<-EOT
set -e
# install and start code-server

7
examples/templates/kubernetes/main.tf
View File

@ -103,10 +103,9 @@ provider "kubernetes" {
data "coder_workspace" "me" {}
resource "coder_agent" "main" {
os = "linux"
arch = "amd64"
startup_script_timeout = 180
startup_script = <<-EOT
os = "linux"
arch = "amd64"
startup_script = <<-EOT
set -e
# install and start code-server

7
examples/templates/nomad-docker/main.tf
View File

@ -88,10 +88,9 @@ data "coder_parameter" "memory" {
data "coder_workspace" "me" {}
resource "coder_agent" "main" {
os = "linux"
arch = "amd64"
startup_script_timeout = 180
startup_script = <<-EOT
os = "linux"
arch = "amd64"
startup_script = <<-EOT
set -e
# install and start code-server
curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server

2
scaletest/templates/scaletest-runner/main.tf
View File

@ -625,8 +625,6 @@ resource "coder_agent" "main" {
vscode = false
ssh_helper = false
}
startup_script_timeout = 86400
shutdown_script_timeout = 7200
startup_script_behavior = "blocking"
startup_script = file("startup.sh")
shutdown_script = file("shutdown.sh")

2
scaletest/terraform/k8s/coder.tf
View File

@ -304,8 +304,6 @@ resource "local_file" "kubernetes_template" {
resource "coder_agent" "main" {
os = "linux"
arch = "amd64"
startup_script_timeout = 180
startup_script = ""
}
resource "kubernetes_pod" "main" {