Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

add metadata to example templates#3451

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.

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

Already on GitHub?Sign in to your account

Merged
bpmct merged 9 commits intomainfrombpmct/add-metadata
Aug 10, 2022
Merged
Show file tree
Hide file tree
Changes from7 commits
Commits
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
20 changes: 18 additions & 2 deletionsexamples/templates/aws-linux/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
}
}
Expand DownExpand Up@@ -146,7 +146,7 @@ EOT
resource "aws_instance" "dev" {
ami = data.aws_ami.ubuntu.id
availability_zone = "${var.region}a"
instance_type ="${var.instance_type}"
instance_type = var.instance_type

user_data = data.coder_workspace.me.transition == "start" ? local.user_data_start : local.user_data_end
tags = {
Expand All@@ -155,3 +155,19 @@ resource "aws_instance" "dev" {
Coder_Provisioned = "true"
}
}

resource "coder_metadata" "workspace_info" {
resource_id = aws_instance.dev.id
item {
key = "region"
value = var.region
}
item {
key = "instance type"
value = aws_instance.dev.instance_type
}
item {
key = "disk"
value = "${aws_instance.dev.root_block_device[0].volume_size} GB"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Nitpick: I think all of these "volume size" parameters are actually measured in GiB, not decimal GB. How about labeling them that way?

Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

for sure!

}
}
20 changes: 18 additions & 2 deletionsexamples/templates/aws-windows/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
}
}
Expand DownExpand Up@@ -99,7 +99,7 @@ EOT
resource "aws_instance" "dev" {
ami = data.aws_ami.windows.id
availability_zone = "${var.region}a"
instance_type ="${var.instance_type}"
instance_type = var.instance_type
count = 1

user_data = data.coder_workspace.me.transition == "start" ? local.user_data_start : local.user_data_end
Expand All@@ -110,3 +110,19 @@ resource "aws_instance" "dev" {
}

}

resource "coder_metadata" "workspace_info" {
resource_id = aws_instance.dev.id
item {
key = "region"
value = var.region
}
item {
key = "instance type"
value = aws_instance.dev.instance_type
}
item {
key = "disk"
value = "${aws_instance.dev.root_block_device[0].volume_size} GB"
}
}
29 changes: 24 additions & 5 deletionsexamples/templates/azure-linux/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
azurerm = {
source = "hashicorp/azurerm"
Expand DownExpand Up@@ -89,9 +89,9 @@ locals {
prefix = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"

userdata = templatefile("cloud-config.yaml.tftpl", {
username= lower(substr(data.coder_workspace.me.owner, 0, 32))
init_script= base64encode(coder_agent.main.init_script)
hostname= lower(data.coder_workspace.me.name)
username = lower(substr(data.coder_workspace.me.owner, 0, 32))
init_script = base64encode(coder_agent.main.init_script)
hostname = lower(data.coder_workspace.me.name)
})
}

Expand DownExpand Up@@ -173,7 +173,7 @@ resource "azurerm_linux_virtual_machine" "main" {
name = "vm"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
size = var.instance_type
size= var.instance_type
// cloud-init overwrites this, so the value here doesn't matter
admin_username = "adminuser"
admin_ssh_key {
Expand DownExpand Up@@ -209,3 +209,22 @@ resource "azurerm_virtual_machine_data_disk_attachment" "home" {
lun = "10"
caching = "ReadWrite"
}

resource "coder_metadata" "workspace_info" {
count = data.coder_workspace.me.start_count
resource_id = azurerm_linux_virtual_machine.main[0].id

item {
key = "type"
value = azurerm_linux_virtual_machine.main[0].size
}
}

resource "coder_metadata" "home_info" {
resource_id = azurerm_managed_disk.home.id

item {
key = "size"
value = "${var.home_size} GB"
}
}
26 changes: 25 additions & 1 deletionexamples/templates/do-linux/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
digitalocean = {
source = "digitalocean/digitalocean"
Expand DownExpand Up@@ -133,3 +133,27 @@ resource "digitalocean_project_resources" "project" {
digitalocean_volume.home_volume.urn
]
}

resource "coder_metadata" "workspace-info" {
count = data.coder_workspace.me.start_count
resource_id = digitalocean_droplet.workspace[0].id

item {
key = "region"
value = digitalocean_droplet.workspace[0].region
}
item {
key = "image"
value = digitalocean_droplet.workspace[0].image
}
}

resource "coder_metadata" "volume-info" {
resource_id = digitalocean_volume.home_volume.id

item {
key = "size"
value = "${digitalocean_volume.home_volume.size} GB"
}

}
9 changes: 4 additions & 5 deletionsexamples/templates/docker-code-server/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
docker = {
source = "kreuzwerker/docker"
Expand DownExpand Up@@ -45,9 +45,9 @@ resource "coder_agent" "main" {
# You can remove this block if you'd prefer to configure Git manually or using
# dotfiles. (see docs/dotfiles.md)
env = {
GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"
GIT_COMMITTER_NAME = "${data.coder_workspace.me.owner}"
GIT_AUTHOR_EMAIL = "${data.coder_workspace.me.owner_email}"
GIT_AUTHOR_NAME= "${data.coder_workspace.me.owner}"
GIT_COMMITTER_NAME= "${data.coder_workspace.me.owner}"
GIT_AUTHOR_EMAIL= "${data.coder_workspace.me.owner_email}"
GIT_COMMITTER_EMAIL = "${data.coder_workspace.me.owner_email}"
}
}
Expand DownExpand Up@@ -81,4 +81,3 @@ resource "docker_container" "workspace" {
volume_name = docker_volume.home_volume.name
read_only = false
}
}
12 changes: 11 additions & 1 deletionexamples/templates/docker-image-builds/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
docker = {
source = "kreuzwerker/docker"
Expand DownExpand Up@@ -120,3 +120,13 @@ resource "docker_container" "workspace" {
read_only = false
}
}

resource "coder_metadata" "container_info" {
count = data.coder_workspace.me.start_count
resource_id = docker_container.workspace[0].id

item {
key = "image"
value = var.docker_image
}
}
12 changes: 11 additions & 1 deletionexamples/templates/docker-with-dotfiles/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
docker = {
source = "kreuzwerker/docker"
Expand DownExpand Up@@ -66,3 +66,13 @@ resource "docker_container" "workspace" {
read_only = false
}
}

resource "coder_metadata" "container_info" {
count = data.coder_workspace.me.start_count
resource_id = docker_container.workspace[0].id

item {
key = "image"
value = var.docker_image
}
}
18 changes: 14 additions & 4 deletionsexamples/templates/docker/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
docker = {
source = "kreuzwerker/docker"
Expand DownExpand Up@@ -80,9 +80,9 @@ resource "coder_agent" "main" {
# You can remove this block if you'd prefer to configure Git manually or using
# dotfiles. (see docs/dotfiles.md)
env = {
GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"
GIT_COMMITTER_NAME = "${data.coder_workspace.me.owner}"
GIT_AUTHOR_EMAIL = "${data.coder_workspace.me.owner_email}"
GIT_AUTHOR_NAME= "${data.coder_workspace.me.owner}"
GIT_COMMITTER_NAME= "${data.coder_workspace.me.owner}"
GIT_AUTHOR_EMAIL= "${data.coder_workspace.me.owner_email}"
GIT_COMMITTER_EMAIL = "${data.coder_workspace.me.owner_email}"
}
}
Expand DownExpand Up@@ -138,3 +138,13 @@ resource "docker_container" "workspace" {
read_only = false
}
}

resource "coder_metadata" "container_info" {
count = data.coder_workspace.me.start_count
resource_id = docker_container.workspace[0].id

item {
key = "image"
value = var.docker_image
}
}
21 changes: 20 additions & 1 deletionexamples/templates/gcp-linux/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
google = {
source = "hashicorp/google"
Expand DownExpand Up@@ -91,3 +91,22 @@ locals {
# Ensure Coder username is a valid Linux username
linux_user = lower(substr(data.coder_workspace.me.owner, 0, 32))
}

resource "coder_metadata" "workspace_info" {
count = data.coder_workspace.me.start_count
resource_id = google_compute_instance.dev[0].id

item {
key = "type"
value = google_compute_instance.dev[0].machine_type
}
}

resource "coder_metadata" "home_info" {
resource_id = google_compute_disk.root.id

item {
key = "size"
value = "${google_compute_disk.root.size} GB"
}
}
12 changes: 11 additions & 1 deletionexamples/templates/gcp-vm-container/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
google = {
source = "hashicorp/google"
Expand DownExpand Up@@ -88,3 +88,13 @@ resource "coder_agent_instance" "dev" {
agent_id = coder_agent.main.id
instance_id = google_compute_instance.dev[0].instance_id
}

resource "coder_metadata" "workspace_info" {
count = data.coder_workspace.me.start_count
resource_id = google_compute_instance.dev[0].id

item {
key = "image"
value = module.gce-container.container.image
}
}
20 changes: 19 additions & 1 deletionexamples/templates/gcp-windows/main.tf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
google = {
source = "hashicorp/google"
Expand DownExpand Up@@ -75,3 +75,21 @@ resource "google_compute_instance" "dev" {
serial-port-enable = "TRUE"
}
}
resource "coder_metadata" "workspace_info" {
count = data.coder_workspace.me.start_count
resource_id = google_compute_instance.dev[0].id

item {
key = "type"
value = google_compute_instance.dev[0].machine_type
}
}

resource "coder_metadata" "home_info" {
resource_id = google_compute_disk.root.id

item {
key = "size"
value = "${google_compute_disk.root.size} GB"
}
}
[8]ページ先頭
©2009-2025 Movatter.jp