Merge pull request #115 from uche-madu/develop

Develop
uche-madu · Oct 23, 2023 · 385ead7 · 385ead7
2 parents 27c293a + 4dd4c8f
commit 385ead7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/terraform/gke.tf b/terraform/gke.tf
@@ -17,15 +17,16 @@ module "gke" {
   source  = "terraform-google-modules/kubernetes-engine/google"
   version = "~> 28.0.0"
 
-  project_id            = module.vpc.project_id
-  name                  = "${var.gke_cluster}-${random_id.suffix.hex}"
-  region                = var.region
-  zones                 = [var.zone]
-  network               = module.vpc.network_name
-  subnetwork            = module.vpc.subnets_names[0]
-  ip_range_pods         = "deb-sub1-secondary-gke-pods"
-  ip_range_services     = "deb-sub1-secondary-gke-services"
-  grant_registry_access = true
+  project_id               = module.vpc.project_id
+  name                     = "${var.gke_cluster}-${random_id.suffix.hex}"
+  region                   = var.region
+  zones                    = [var.zone]
+  network                  = module.vpc.network_name
+  subnetwork               = module.vpc.subnets_names[0]
+  ip_range_pods            = "deb-sub1-secondary-gke-pods"
+  ip_range_services        = "deb-sub1-secondary-gke-services"
+  grant_registry_access    = true
+  remove_default_node_pool = true
 
   cluster_autoscaling = {
     "auto_repair" : true,
@@ -42,17 +43,16 @@ module "gke" {
 
   node_pools = [
     {
-      name               = var.node_pool_name
-      machine_type       = var.machine_type
-      node_locations     = var.zone #join(",", random_shuffle.zones.result)
-      min_count          = 1
-      max_count          = 3
-      disk_size_gb       = 32
-      disk_type          = "pd-standard"
-      image_type         = "COS_CONTAINERD"
-      service_account    = data.google_service_account.deb-sa.email
-      preemptible        = false
-      initial_node_count = var.node_count
+      name            = var.node_pool_name
+      machine_type    = var.machine_type
+      min_count       = 1
+      max_count       = 3
+      disk_size_gb    = 32
+      disk_type       = "pd-standard"
+      image_type      = "COS_CONTAINERD"
+      service_account = data.google_service_account.deb-sa.email
+      preemptible     = false
+      max_unavailable = 1
     },
   ]
 

diff --git a/terraform/terraform.tfvars b/terraform/terraform.tfvars
@@ -11,7 +11,7 @@ subnet-01    = "deb-sub1"
 # GKE
 gke_cluster    = "deb-airflow-cluster"
 node_pool_name = "deb-node-pool"
-machine_type   = "n2-standard-2"
+machine_type   = "n2-standard-4"
 node_count     = 3
 
 airflow-gke-workload-identity = "airflow-workload-identity"