issue #1: removed unused cluster node pool

ai-cfia · Jan 5, 2024 · cb82279 · cb82279
1 parent 7dd8399
commit cb82279
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,6 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
+
+# jq (used to gather information when terraform applying or plannig)
+jq
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/backends.tf b/backends.tf
diff --git a/terraform/dns/provider.tf b/terraform/dns/provider.tf
diff --git a/terraform/dns/variables.tf b/terraform/dns/variables.tf
diff --git a/terraform/gcp-kubernetes-cluster/cluster.tf b/terraform/gcp-kubernetes-cluster/cluster.tf
@@ -68,52 +68,22 @@ resource "google_container_node_pool" "nodepool" {
     auto_upgrade = true
   }
 
-  node_config {
-    preemptible  = false
-    machine_type = "e2-small"
-
-    labels = {
-      role = "general"
-    }
-
-    service_account = google_service_account.kubernetes.email
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/cloud-platform"
-    ]
-  }
-}
-
-resource "google_container_node_pool" "spot" {
-  name    = "${var.cluster_name}-spot-nodepool"
-  cluster = google_container_cluster.cluster.id
-
-  management {
-    auto_repair  = true
-    auto_upgrade = true
-  }
-
   autoscaling {
-    min_node_count = 0
-    max_node_count = 3
+    min_node_count = 1
+    max_node_count = 10
   }
 
   node_config {
-    preemptible  = true
+    preemptible  = false
     machine_type = "e2-small"
 
     labels = {
-      team = "devsecops"
-    }
-
-    taint {
-      key    = "instance_type"
-      value  = "${var.cluster_name}-spot"
-      effect = "NO_SCHEDULE"
+      role = "general"
     }
 
     service_account = google_service_account.kubernetes.email
     oauth_scopes = [
       "https://www.googleapis.com/auth/cloud-platform"
     ]
   }
-}
+}