Skip to content

chore: add agent metadata to example templates #7044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 12, 2023
Merged

chore: add agent metadata to example templates #7044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c29960f
add `display_name`
matifali Apr 4, 2023
1fec644
fix typos and `terraform validate`
matifali Apr 4, 2023
43c1a80
Merge branch 'coder:main' into update-example-templates
matifali Apr 7, 2023
6c9959e
update display_name
matifali Apr 7, 2023
7fb6e5a
Add agent metadata
matifali Apr 7, 2023
d648d3f
add % to cpu usage
matifali Apr 7, 2023
7c4a750
update disk usage check script
matifali Apr 7, 2023
eda7940
remove metadata from containers and pods workspaces
matifali Apr 8, 2023
e4ebef4
removes disk metadata from container workspaces
matifali Apr 8, 2023
43e658c
Merge branch 'main' into pr/matifali/7044
bpmct Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update display_name
  • Loading branch information
@matifali
matifali committed Apr 7, 2023
commit 6c9959e5c001db802296275db1942b115a425fc9
6 changes: 3 additions & 3 deletions examples/templates/do-linux/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ data "coder_parameter" "droplet_size" {

data "coder_parameter" "home_volume_size" {
name = "home_volume_size"
display_name = "How large would you like your home volume to be (in GB)?"
description = "This volume will be mounted to /home/coder."
display_name = "Home Volume Size"
description = "How large would you like your home volume to be (in GB)?"
type = "number"
default = "20"
mutable = false
Expand All @@ -160,7 +160,7 @@ data "coder_parameter" "home_volume_size" {

data "coder_parameter" "region" {
name = "region"
display_name = "Which region would you like to use?"
display_name = "Region"
description = "This is the region where your workspace will be created."
icon = "/emojis/1f30e.png"
type = "string"
Expand Down
2 changes: 1 addition & 1 deletion examples/templates/docker-image-builds/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ resource "coder_app" "code-server" {
}

data "coder_parameter" "docker_image" {
name = "What Docker image would you like to use for your workspace?"
name = "Docker Image"
description = "The Docker image will be used to build your workspace. You can choose from a list of pre-built images or provide your own."
default = "base"
icon = "/icon/docker.png"
Expand Down
4 changes: 2 additions & 2 deletions examples/templates/docker-with-dotfiles/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ data "coder_workspace" "me" {

data "coder_parameter" "docker_image" {
name = "docker_image"
display_name = "What Docker image would you like to use for your workspace?"
display_name = "Docker Image"
description = "The Docker image will be used to build your workspace."
default = "codercom/enterprise-base:ubuntu"
icon = "/icon/docker.png"
Expand All @@ -39,7 +39,7 @@ data "coder_parameter" "docker_image" {

data "coder_parameter" "dotfiles_uri" {
name = "dotfiles_uri"
display_name = "What dotfiles repo would you like to use for your workspace?"
display_name = "dotfiles URI"
description = <<-EOF
Dotfiles repo URI (optional)

Expand Down
6 changes: 3 additions & 3 deletions examples/templates/fly-docker-image/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ data "coder_parameter" "cputype" {

data "coder_parameter" "memory" {
name = "memory"
display_name = "Memory (GB)"
display_name = "Memory"
description = "The amount of memory to allocate to the workspace in GB (up to 16GB)"
type = "number"
default = "2"
Expand All @@ -162,7 +162,7 @@ data "coder_parameter" "memory" {

data "coder_parameter" "volume-size" {
name = "volume-size"
display_name = "Volume Size"
display_name = "Home Volume Size"
description = "The size of the volume to create for the workspace in GB (1-20)"
type = "number"
default = "1"
Expand Down Expand Up @@ -260,7 +260,7 @@ data "coder_parameter" "region" {
resource "coder_app" "code-server" {
count = 1
agent_id = coder_agent.main.id
display_name = "Code Server"
display_name = "code-server"
slug = "code-server"
url = "http://localhost:8080?folder=/home/coder/"
icon = "/icon/code.svg"
Expand Down
3 changes: 2 additions & 1 deletion examples/templates/gcp-linux/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ variable "project_id" {

data "coder_parameter" "zone" {
name = "zone"
display_name = "What region should your workspace live in?"
display_name = "Zone"
description = "Which zone should your workspace live in?"
type = "string"
icon = "/emojis/1f30e.png"
default = "us-central1-a"
Expand Down
3 changes: 2 additions & 1 deletion examples/templates/gcp-vm-container/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ variable "project_id" {

data "coder_parameter" "zone" {
name = "zone"
display_name = "What region should your workspace live in?"
display_name = "Zone"
description = "Which zone should your workspace live in?"
type = "string"
default = "us-central1-a"
icon = "/emojis/1f30e.png"
Expand Down
3 changes: 2 additions & 1 deletion examples/templates/gcp-windows/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ variable "project_id" {

data "coder_parameter" "zone" {
name = "zone"
display_name = "What region should your workspace live in?"
display_name = "Zone"
description = "Which zone should your workspace live in?"
type = "string"
default = "us-central1-a"
icon = "/emojis/1f30e.png"
Expand Down
9 changes: 6 additions & 3 deletions examples/templates/kubernetes-with-podman/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ data "coder_workspace" "me" {}
data "coder_parameter" "os" {
name = "os"
display_name = "Operating system"
description = "The operating system to use for your workspace."
default = "ubuntu"
option {
name = "Ubuntu"
Expand All @@ -35,7 +36,8 @@ data "coder_parameter" "os" {

data "coder_parameter" "cpu" {
name = "cpu"
display_name = "CPU (cores)"
display_name = "CPU"
description = "The number of CPU cores"
default = "2"
option {
name = "2 Cores"
Expand All @@ -57,7 +59,8 @@ data "coder_parameter" "cpu" {

data "coder_parameter" "memory" {
name = "memory"
display_name = "Memory (GB)"
display_name = "Memory"
description = "The amount of memory (in GB)"
default = "2"
option {
name = "2 GB"
Expand Down Expand Up @@ -96,7 +99,7 @@ resource "coder_agent" "dev" {
# code-server
resource "coder_app" "code-server" {
agent_id = coder_agent.dev.id
display_name = "Code Server"
display_name = "code-server"
slug = "code-server"
icon = "/icon/code.svg"
url = "http://localhost:13337"
Expand Down
9 changes: 6 additions & 3 deletions examples/templates/kubernetes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ variable "namespace" {

data "coder_parameter" "cpu" {
name = "cpu"
display_name = "CPU (cores)"
display_name = "CPU"
description = "The number of CPU cores"
default = "2"
icon = "/icon/memory.svg"
mutable = true
Expand All @@ -60,7 +61,8 @@ data "coder_parameter" "cpu" {

data "coder_parameter" "memory" {
name = "memory"
display_name = "Memory (GB)"
display_name = "Memory"
description = "The amount of memory in GB"
default = "2"
icon = "/icon/memory.svg"
mutable = true
Expand All @@ -84,7 +86,8 @@ data "coder_parameter" "memory" {

data "coder_parameter" "home_disk_size" {
name = "home_disk_size"
display_name = "Home Disk Size (GB)"
display_name = "Home Disk Size"
description = "The size of the home disk in GB"
default = "10"
type = "number"
icon = "/emojis/1f4be.png"
Expand Down