[tf/gcp][fullnode] fix nap scheduling and apply when disabled (aptos-…

…labs#5737)
petmehdivet · Dec 4, 2022 · 60ee595 · 60ee595
1 parent 071885c
commit 60ee595
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/terraform/fullnode/gcp/cluster.tf b/terraform/fullnode/gcp/cluster.tf
@@ -67,16 +67,16 @@ resource "google_container_cluster" "aptos" {
   cluster_autoscaling {
     enabled = var.gke_enable_node_autoprovisioning
 
-    resource_limits {
-      resource_type = "cpu"
-      minimum       = 1
-      maximum       = var.gke_node_autoprovisioning_max_cpu
-    }
-
-    resource_limits {
-      resource_type = "memory"
-      minimum       = 1
-      maximum       = var.gke_node_autoprovisioning_max_memory
+    dynamic "resource_limits" {
+      for_each = var.gke_enable_node_autoprovisioning ? {
+        "cpu"    = var.gke_node_autoprovisioning_max_cpu
+        "memory" = var.gke_node_autoprovisioning_max_memory
+      } : {}
+      content {
+        resource_type = resource_limits.key
+        minimum       = 1
+        maximum       = resource_limits.value
+      }
     }
   }
 }

diff --git a/terraform/fullnode/gcp/kubernetes.tf b/terraform/fullnode/gcp/kubernetes.tf
@@ -87,7 +87,7 @@ resource "helm_release" "fullnode" {
       image = {
         tag = var.image_tag
       }
-      nodeSelector = {
+      nodeSelector = var.gke_enable_node_autoprovisioning ? {} : {
         "cloud.google.com/gke-nodepool"          = "fullnodes"
         "iam.gke.io/gke-metadata-server-enabled" = "true"
       }