Make use of zonal cluster

jupyter/terraform-gke/main.tf → jupyter/terraform-gke/gke_cluster.tf

@@ -1,27 +1,28 @@
-locals {
- terraform_service_account = "${var.account_id}@${var.project_id}.iam.gserviceaccount.com"
-}
-
 data "google_client_config" "default" {}
 
+# In case of using a gke deployment, use the GKE provider. Otherwise we create a container cluster.
 module "gke" {
   source            = "terraform-google-modules/kubernetes-engine/google"
   project_id        = var.project_id
   name              = var.cluster_name
-  region            = "us-central1"
-  zones             = ["us-central1-c"]
+  # Create a ZONAL cluster, dissallowing the cluster to span multiple regions in a zone.
+  # Alternatively, for scheduling cross-regions, utilize `zone` and `regions` instead of `regional` and `region`
+  regional          = false
+  region            = var.project_region
   network           = module.gcp-network.network_name
   subnetwork        = module.gcp-network.subnets_names[0]
   ip_range_pods     = var.ip_range_pods_name
   ip_range_services = var.ip_range_services_name
 
   http_load_balancing        = false
   network_policy             = false
-  horizontal_pod_autoscaling = true
+  horizontal_pod_autoscaling = false
   filestore_csi_driver       = false
   service_account            = local.terraform_service_account
   create_service_account     = false
   kubernetes_version         = var.kubernetes_version
+
+
   node_pools                 = [
     {
       name               = "default-node-pool"
@@ -116,4 +117,4 @@ module "gke" {
       "fltk-experiment-pool-1",
     ]
   }
-}
+}

jupyter/terraform-gke/outputs.tf

@@ -0,0 +1,35 @@
+output "kubernetes_endpoint" {
+  description = "The cluster endpoint"
+  sensitive   = true
+  value       = module.gke.endpoint
+}
+
+output "ca_certificate" {
+  description = "The cluster ca certificate (base64 encoded)"
+  value       = module.gke.ca_certificate
+}
+
+output "terraform_service_account" {
+  description = "The default service account used for running nodes (user-provided)"
+  value       = module.gke.service_account
+}
+
+output "cluster_identifier" {
+  description = "Cluster name"
+  value       = module.gke.name
+}
+
+output "private_network_identifier" {
+  description = "The name of the VPC being created (user-provided)"
+  value       = module.gcp-network.network_name
+}
+
+output "subnet_identifier" {
+  description = "The name of the subnet being created (user-provided)"
+  value       = module.gcp-network.subnets_names
+}
+
+output "subnet_ranges" {
+  description = "The secondary ranges associated with the subnet (pods, and services)"
+  value       = module.gcp-network.subnets_secondary_ranges
+}

jupyter/terraform-gke/resources.tf

@@ -1,4 +1,3 @@
-# resources.tf
 
 terraform {
   required_providers {