Update coder provider
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing

This commit is contained in:
Steve McMaster 2025-10-30 19:28:40 -04:00
parent da6a60ae9a
commit d78b52fbe6

View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
coder = { coder = {
source = "coder/coder" source = "coder/coder"
version = "~> 0.12.3" version = ">= 2.4.0"
} }
kubernetes = { kubernetes = {
source = "hashicorp/kubernetes" source = "hashicorp/kubernetes"
@ -213,6 +213,10 @@ provider "coder" {
data "coder_workspace" "me" {} data "coder_workspace" "me" {}
{% endblock %} {% endblock %}
{% block workspace_owner %}
data "coder_workspace_owner" "me" {}
{% endblock %}
{% block coder_agent %} {% block coder_agent %}
resource "coder_agent" "main" { resource "coder_agent" "main" {
os = "linux" os = "linux"
@ -257,8 +261,8 @@ resource "coder_agent" "main" {
[ ! -f ~/.profile ] && [ -f /etc/skel/.profile ] && cp /etc/skel/.profile $HOME [ ! -f ~/.profile ] && [ -f /etc/skel/.profile ] && cp /etc/skel/.profile $HOME
[ ! -f ~/.bashrc ] && [ -f /etc/skel/.bashrc ] && cp /etc/skel/.bashrc $HOME [ ! -f ~/.bashrc ] && [ -f /etc/skel/.bashrc ] && cp /etc/skel/.bashrc $HOME
git config --global user.name "${data.coder_parameter.git_user_name.value == "" ? data.coder_workspace.me.owner : data.coder_parameter.git_user_name.value}" git config --global user.name "${data.coder_parameter.git_user_name.value == "" ? data.coder_workspace_owner.me.full_name : data.coder_parameter.git_user_name.value}"
git config --global user.email "${data.coder_parameter.git_email.value == "" ? data.coder_workspace.me.owner_email : data.coder_parameter.git_email.value}" git config --global user.email "${data.coder_parameter.git_email.value == "" ? data.coder_workspace_owner.me.email : data.coder_parameter.git_email.value}"
{% endblock %} {% endblock %}
{% block post_startup_script_setup_home %} {% block post_startup_script_setup_home %}
@ -380,21 +384,21 @@ resource "coder_script" "{{ startup_script }}" {
{% block home_volume %} {% block home_volume %}
resource "kubernetes_persistent_volume_claim" "home" { resource "kubernetes_persistent_volume_claim" "home" {
metadata { metadata {
name = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}-home" name = "coder-${lower(data.coder_workspace_owner.me.full_name)}-${lower(data.coder_workspace.me.name)}-home"
namespace = "coder" namespace = "coder"
labels = { labels = {
"app.kubernetes.io/name" = "coder-pvc" "app.kubernetes.io/name" = "coder-pvc"
"app.kubernetes.io/instance" = "coder-pvc-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}" "app.kubernetes.io/instance" = "coder-pvc-${lower(data.coder_workspace_owner.me.full_name)}-${lower(data.coder_workspace.me.name)}"
"app.kubernetes.io/part-of" = "coder" "app.kubernetes.io/part-of" = "coder"
//Coder-specific labels. //Coder-specific labels.
"com.coder.resource" = "true" "com.coder.resource" = "true"
"com.coder.workspace.id" = data.coder_workspace.me.id "com.coder.workspace.id" = data.coder_workspace.me.id
"com.coder.workspace.name" = data.coder_workspace.me.name "com.coder.workspace.name" = data.coder_workspace.me.name
"com.coder.user.id" = data.coder_workspace.me.owner_id "com.coder.user.id" = data.coder_workspace_owner.me.id
"com.coder.user.username" = data.coder_workspace.me.owner "com.coder.user.username" = data.coder_workspace_owner.me.full_name
} }
annotations = { annotations = {
"com.coder.user.email" = data.coder_workspace.me.owner_email "com.coder.user.email" = data.coder_workspace_owner.me.email
} }
} }
wait_until_bound = false wait_until_bound = false
@ -418,20 +422,20 @@ resource "kubernetes_deployment" "main" {
] ]
wait_for_rollout = false wait_for_rollout = false
metadata { metadata {
name = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}" name = "coder-${lower(data.coder_workspace_owner.me.full_name)}-${lower(data.coder_workspace.me.name)}"
namespace = "coder" namespace = "coder"
labels = { labels = {
"app.kubernetes.io/name" = "coder-workspace" "app.kubernetes.io/name" = "coder-workspace"
"app.kubernetes.io/instance" = "coder-workspace-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}" "app.kubernetes.io/instance" = "coder-workspace-${lower(data.coder_workspace_owner.me.full_name)}-${lower(data.coder_workspace.me.name)}"
"app.kubernetes.io/part-of" = "coder" "app.kubernetes.io/part-of" = "coder"
"com.coder.resource" = "true" "com.coder.resource" = "true"
"com.coder.workspace.id" = data.coder_workspace.me.id "com.coder.workspace.id" = data.coder_workspace.me.id
"com.coder.workspace.name" = data.coder_workspace.me.name "com.coder.workspace.name" = data.coder_workspace.me.name
"com.coder.user.id" = data.coder_workspace.me.owner_id "com.coder.user.id" = data.coder_workspace_owner.me.id
"com.coder.user.username" = data.coder_workspace.me.owner "com.coder.user.username" = data.coder_workspace_owner.me.full_name
} }
annotations = { annotations = {
"com.coder.user.email" = data.coder_workspace.me.owner_email "com.coder.user.email" = data.coder_workspace_owner.me.email
} }
} }