update kubernetes

matifali · matifali · commit 3c3c0ef3311b · 2023-03-14T07:54:11.000+03:00
diff --git a/examples/templates/kubernetes-with-podman/main.tf b/examples/templates/kubernetes-with-podman/main.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "~> 0.6.14"
+      version = "~> 0.6.17"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.12"
+      version = "~> 2.18"
     }
   }
 }
@@ -74,7 +74,6 @@ data "coder_parameter" "memory" {
   }
 }
 
-
 resource "coder_agent" "dev" {
   os             = "linux"
   arch           = "amd64"
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
@@ -2,17 +2,21 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "~> 0.6.14"
+      version = "~> 0.6.17"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.12"
+      version = "~> 2.18"
     }
   }
 }
 
-data "coder_parameter" "use_kubeconfig" {
-  name        = "Use host kubeconfig? (true/false)"
+provider "coder" {
+  feature_use_managed_variables = true
+}
+
+variable "use_kubeconfig" {
+  type        = bool
   description = <<-EOF
   Use host kubeconfig? (true/false)
 
@@ -22,14 +26,12 @@ data "coder_parameter" "use_kubeconfig" {
   Set this to true if the Coder host is running outside the Kubernetes cluster
   for workspaces.  A valid "~/.kube/config" must be present on the Coder host.
   EOF
-  type        = "bool"
-  default     = "false"
-  mutable     = false
+  default     = false
 }
 
-data "coder_parameter" "namespace" {
-  name    = "The Kubernetes namespace to create workspaces in (must exist prior to creating workspaces)"
-  mutable = false
+variable "namespace" {
+  type        = string
+  description = "The Kubernetes namespace to create workspaces in (must exist prior to creating workspaces)"
 }
 
 data "coder_parameter" "cpu" {
@@ -91,15 +93,14 @@ data "coder_parameter" "home_disk_size" {
 
 provider "kubernetes" {
   # Authenticate via ~/.kube/config or a Coder-specific ServiceAccount, depending on admin preferences
-  config_path = "data.coder_parameter.use_kubeconfig.value" == "true" ? "~/.kube/config" : null
+  config_path = var.namespace == true ? "~/.kube/config" : null
 }
 
 data "coder_workspace" "me" {}
 
 resource "coder_agent" "main" {
-  os   = "linux"
-  arch = "amd64"
-
+  os                     = "linux"
+  arch                   = "amd64"
   login_before_ready     = false
   startup_script_timeout = 180
   startup_script         = <<-EOT
@@ -131,7 +132,7 @@ resource "coder_app" "code-server" {
 resource "kubernetes_persistent_volume_claim" "home" {
   metadata {
     name      = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}-home"
-    namespace = data.coder_parameter.namespace.value
+    namespace = var.namespace
     labels = {
       "app.kubernetes.io/name"     = "coder-pvc"
       "app.kubernetes.io/instance" = "coder-pvc-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}"
@@ -162,7 +163,7 @@ resource "kubernetes_pod" "main" {
   count = data.coder_workspace.me.start_count
   metadata {
     name      = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}"
-    namespace = data.coder_parameter.namespace.value
+    namespace = var.namespace
     labels = {
       "app.kubernetes.io/name"     = "coder-workspace"
       "app.kubernetes.io/instance" = "coder-workspace-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}"

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`coder = {`
`4`	`4`	`source = "coder/coder"`
`5`		`- version = "~> 0.6.14"`
	`5`	`+ version = "~> 0.6.17"`
`6`	`6`	`}`
`7`	`7`	`kubernetes = {`
`8`	`8`	`source = "hashicorp/kubernetes"`
`9`		`- version = "~> 2.12"`
	`9`	`+ version = "~> 2.18"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
`@@ -74,7 +74,6 @@ data "coder_parameter" "memory" {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`-`
`78`	`77`	`resource "coder_agent" "dev" {`
`79`	`78`	`os = "linux"`
`80`	`79`	`arch = "amd64"`