refactor: make k8s version a variable and mandatory

BrownUniversity · Jan 11, 2023 · 5b08be3 · 5b08be3
1 parent 715a195
commit 5b08be3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/examples/sample-jhub/main.tf b/examples/sample-jhub/main.tf
@@ -28,6 +28,7 @@ module "sample-jhub" {
   record_domain   = local.jhub_domain
 
   # ---------------- CLUSTER VARIABLES -----------------------
+  kubernetes_version         = 1.24
   regional                   = false
   region                     = local.gcp_region
   gcp_zone                   = local.gcp_zone

diff --git a/main.tf b/main.tf
@@ -71,7 +71,7 @@ module "jhub_cluster" {
   source                     = "git::https://github.com/BrownUniversity/terraform-gcp-cluster.git?ref= v0.1.5"
   cluster_name               = var.cluster_name
   project_id                 = module.jhub_project.project_id
-  kubernetes_version         = "1.24"
+  kubernetes_version         = var.kubernetes_version
   regional                   = var.regional
   region                     = var.region
   node_zones                 = [var.gcp_zone]

diff --git a/variables.tf b/variables.tf
@@ -391,6 +391,11 @@ variable "helm_values_file" {
   description = "Relative path and file name. Example: values.yaml"
 }
 
+variable "kubernetes_version" {
+  type        = string
+  description = "The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region."
+}
+
 variable "jhub_helm_version" {
   type        = string
   description = "Version of the JupyterHub Helm Chart Release"