chore: update kubernetes resources to versioned names in templates (#21328)

rowansmithau · web-flow · commit a9d8b123dc50 · 2025-12-19T12:45:35.000+05:00
follows on from coder/registry#616 As part of https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/guides/v3-upgrade-guide various resources change from non versioned to versioned. This PR changes the Coder authored templates to versioned resources. - Updated kubernetes_persistent_volume_claim to kubernetes_persistent_volume_claim_v1 - Updated kubernetes_deployment to kubernetes_deployment_v1 - Updated kubernetes_pod to kubernetes_pod_v1 - Updated kubernetes_secret to kubernetes_secret_v1 - Updated all resource references and dependencies
diff --git a/examples/templates/kubernetes-devcontainer/main.tf b/examples/templates/kubernetes-devcontainer/main.tf
@@ -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
@@ -164,7 +164,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
@@ -184,7 +184,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
@@ -215,10 +215,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 {
@@ -297,7 +297,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
           }
         }
diff --git a/examples/templates/kubernetes-envbox/main.tf b/examples/templates/kubernetes-envbox/main.tf
@@ -120,7 +120,7 @@ module "jetbrains" {
   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
@@ -136,7 +136,7 @@ resource "kubernetes_persistent_volume_claim" "home" {
   }
 }
 
-resource "kubernetes_pod" "main" {
+resource "kubernetes_pod_v1" "main" {
   count = data.coder_workspace.me.start_count
 
   metadata {
@@ -283,7 +283,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
       }
     }
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
@@ -191,7 +191,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
@@ -221,10 +221,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 {
@@ -315,7 +315,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
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ module "jetbrains" {`
`120`	`120`	`folder = "/home/coder"`
`121`	`121`	`}`
`122`	`122`
`123`		`-resource "kubernetes_persistent_volume_claim" "home" {`
	`123`	`+resource "kubernetes_persistent_volume_claim_v1" "home" {`
`124`	`124`	`metadata {`
`125`	`125`	`name = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}-home"`
`126`	`126`	`namespace = var.namespace`
`@@ -136,7 +136,7 @@ resource "kubernetes_persistent_volume_claim" "home" {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`-resource "kubernetes_pod" "main" {`
	`139`	`+resource "kubernetes_pod_v1" "main" {`
`140`	`140`	`count = data.coder_workspace.me.start_count`
`141`	`141`
`142`	`142`	`metadata {`
`@@ -283,7 +283,7 @@ resource "kubernetes_pod" "main" {`
`283`	`283`	`volume {`
`284`	`284`	`name = "home"`
`285`	`285`	`persistent_volume_claim {`
`286`		`- claim_name = kubernetes_persistent_volume_claim.home.metadata.0.name`
	`286`	`+ claim_name = kubernetes_persistent_volume_claim_v1.home.metadata.0.name`
`287`	`287`	`read_only = false`
`288`	`288`	`}`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ resource "coder_app" "code-server" {`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`-resource "kubernetes_persistent_volume_claim" "home" {`
	`194`	`+resource "kubernetes_persistent_volume_claim_v1" "home" {`
`195`	`195`	`metadata {`
`196`	`196`	`name = "coder-${data.coder_workspace.me.id}-home"`
`197`	`197`	`namespace = var.namespace`
`@@ -221,10 +221,10 @@ resource "kubernetes_persistent_volume_claim" "home" {`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`
`224`		`-resource "kubernetes_deployment" "main" {`
	`224`	`+resource "kubernetes_deployment_v1" "main" {`
`225`	`225`	`count = data.coder_workspace.me.start_count`
`226`	`226`	`depends_on = [`
`227`		`- kubernetes_persistent_volume_claim.home`
	`227`	`+ kubernetes_persistent_volume_claim_v1.home`
`228`	`228`	`]`
`229`	`229`	`wait_for_rollout = false`
`230`	`230`	`metadata {`
`@@ -315,7 +315,7 @@ resource "kubernetes_deployment" "main" {`
`315`	`315`	`volume {`
`316`	`316`	`name = "home"`
`317`	`317`	`persistent_volume_claim {`
`318`		`- claim_name = kubernetes_persistent_volume_claim.home.metadata.0.name`
	`318`	`+ claim_name = kubernetes_persistent_volume_claim_v1.home.metadata.0.name`
`319`	`319`	`read_only = false`
`320`	`320`	`}`
`321`	`321`	`}`