Skip to content

chore: update Kubernetes resources to v1 API for provider v3 compatibility #616

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
rowansmithau merged 3 commits into from
Dec 18, 2025
+20 −22
Merged

chore: update Kubernetes resources to v1 API for provider v3 compatibility #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c86d3c
Update Kubernetes resources to v1 API for provider v3 compatibility
rowansmithau Dec 18, 2025
d293c86
Fix kubernetes_secret_v1 and jetbrains module source
rowansmithau Dec 18, 2025
52f82d8
Remove deprecated agent_name arguments from modules
rowansmithau Dec 18, 2025
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
12 changes: 6 additions & 6 deletions registry/coder/templates/kubernetes-devcontainer/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ variable "cache_repo_secret_name" {
type = string
}

data "kubernetes_secret" "cache_repo_dockerconfig_secret" {
data "kubernetes_secret_v1" "cache_repo_dockerconfig_secret" {
count = var.cache_repo_secret_name == "" ? 0 : 1
metadata {
name = var.cache_repo_secret_name
Expand All @@ -166,7 +166,7 @@ locals {
# Use the docker gateway if the access URL is 127.0.0.1
"ENVBUILDER_INIT_SCRIPT" : replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal"),
"ENVBUILDER_FALLBACK_IMAGE" : data.coder_parameter.fallback_image.value,
"ENVBUILDER_DOCKER_CONFIG_BASE64" : base64encode(try(data.kubernetes_secret.cache_repo_dockerconfig_secret[0].data[".dockerconfigjson"], "")),
"ENVBUILDER_DOCKER_CONFIG_BASE64" : base64encode(try(data.kubernetes_secret_v1.cache_repo_dockerconfig_secret[0].data[".dockerconfigjson"], "")),
"ENVBUILDER_PUSH_IMAGE" : var.cache_repo == "" ? "" : "true"
# You may need to adjust this if you get an error regarding deleting files when building the workspace.
# For example, when testing in KinD, it was necessary to set `/product_name` and `/product_uuid` in
Expand All @@ -186,7 +186,7 @@ resource "envbuilder_cached_image" "cached" {
insecure = var.insecure_cache_repo
}

resource "kubernetes_persistent_volume_claim" "workspaces" {
resource "kubernetes_persistent_volume_claim_v1" "workspaces" {
metadata {
name = "coder-${lower(data.coder_workspace.me.id)}-workspaces"
namespace = var.namespace
Expand Down Expand Up @@ -217,10 +217,10 @@ resource "kubernetes_persistent_volume_claim" "workspaces" {
}
}

resource "kubernetes_deployment" "main" {
resource "kubernetes_deployment_v1" "main" {
count = data.coder_workspace.me.start_count
depends_on = [
kubernetes_persistent_volume_claim.workspaces
kubernetes_persistent_volume_claim_v1.workspaces
]
wait_for_rollout = false
metadata {
Expand Down Expand Up @@ -300,7 +300,7 @@ resource "kubernetes_deployment" "main" {
volume {
name = "workspaces"
persistent_volume_claim {
claim_name = kubernetes_persistent_volume_claim.workspaces.metadata.0.name
claim_name = kubernetes_persistent_volume_claim_v1.workspaces.metadata.0.name
read_only = false
}
}
Expand Down
22 changes: 10 additions & 12 deletions registry/coder/templates/kubernetes-envbox/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,20 @@ module "code-server" {
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
version = "~> 1.0"

agent_id = coder_agent.main.id
agent_name = "main"
order = 1
agent_id = coder_agent.main.id
order = 1
}

# See https://registry.coder.com/modules/coder/jetbrains
module "jetbrains" {
count = data.coder_workspace.me.start_count
source = "registry.coder.com/modules/coder/jetbrains/coder"
version = "~> 1.0"
agent_id = coder_agent.main.id
agent_name = "main"
folder = "/home/coder"
count = data.coder_workspace.me.start_count
source = "registry.coder.com/coder/jetbrains/coder"
version = "~> 1.0"
agent_id = coder_agent.main.id
folder = "/home/coder"
}

resource "kubernetes_persistent_volume_claim" "home" {
resource "kubernetes_persistent_volume_claim_v1" "home" {
metadata {
name = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}-home"
namespace = var.namespace
Expand All @@ -137,7 +135,7 @@ resource "kubernetes_persistent_volume_claim" "home" {
}
}

resource "kubernetes_pod" "main" {
resource "kubernetes_pod_v1" "main" {
count = data.coder_workspace.me.start_count

metadata {
Expand Down Expand Up @@ -284,7 +282,7 @@ resource "kubernetes_pod" "main" {
volume {
name = "home"
persistent_volume_claim {
claim_name = kubernetes_persistent_volume_claim.home.metadata.0.name
claim_name = kubernetes_persistent_volume_claim_v1.home.metadata.0.name
read_only = false
}
}
Expand Down
8 changes: 4 additions & 4 deletions registry/coder/templates/kubernetes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ resource "coder_app" "code-server" {
}
}

resource "kubernetes_persistent_volume_claim" "home" {
resource "kubernetes_persistent_volume_claim_v1" "home" {
metadata {
name = "coder-${data.coder_workspace.me.id}-home"
namespace = var.namespace
Expand Down Expand Up @@ -222,10 +222,10 @@ resource "kubernetes_persistent_volume_claim" "home" {
}
}

resource "kubernetes_deployment" "main" {
resource "kubernetes_deployment_v1" "main" {
count = data.coder_workspace.me.start_count
depends_on = [
kubernetes_persistent_volume_claim.home
kubernetes_persistent_volume_claim_v1.home
]
wait_for_rollout = false
metadata {
Expand Down Expand Up @@ -316,7 +316,7 @@ resource "kubernetes_deployment" "main" {
volume {
name = "home"
persistent_volume_claim {
claim_name = kubernetes_persistent_volume_claim.home.metadata.0.name
claim_name = kubernetes_persistent_volume_claim_v1.home.metadata.0.name
read_only = false
}
}
Expand Down