Merge pull request #297 from kbst/gke-node-pool-location-policy

GKE: Add location policy required from v1.24.1

Author: pst

google/_modules/gke/node_pool.tf

@@ -16,6 +16,7 @@ module "node_pool" {
   initial_node_count = var.initial_node_count
   min_node_count     = var.min_node_count
   max_node_count     = var.max_node_count
+  location_policy    = var.location_policy
 
   extra_oauth_scopes = var.extra_oauth_scopes
 

google/_modules/gke/node_pool/main.tf

@@ -7,8 +7,9 @@ resource "google_container_node_pool" "current" {
   initial_node_count = var.initial_node_count
 
   autoscaling {
-    min_node_count = var.min_node_count
-    max_node_count = var.max_node_count
+    min_node_count  = var.min_node_count
+    max_node_count  = var.max_node_count
+    location_policy = var.location_policy
   }
 
   node_locations = var.node_locations

google/_modules/gke/node_pool/variables.tf

@@ -43,6 +43,11 @@ variable "max_node_count" {
   type        = string
 }
 
+variable "location_policy" {
+  type        = string
+  description = "Location policy specifies the algorithm used when scaling-up the node pool."
+}
+
 variable "service_account_email" {
   description = "The service account email to use for this node pool."
   type        = string

google/_modules/gke/variables.tf

@@ -28,9 +28,9 @@ variable "location" {
   description = "Location accepts a region or zone and starts a regional or zonal cluster respectively. Kubestack is only supported for regional clusters."
 }
 
-variable "node_locations" {
-  type        = list(string)
-  description = "List of zones in the cluster's region to start worker nodes in."
+variable "location_policy" {
+  type        = string
+  description = "Location policy specifies the algorithm used when scaling-up the node pool."
 }
 
 variable "min_master_version" {
@@ -63,6 +63,11 @@ variable "max_node_count" {
   type        = string
 }
 
+variable "node_locations" {
+  type        = list(string)
+  description = "List of zones in the cluster's region to start worker nodes in."
+}
+
 variable "extra_oauth_scopes" {
   description = "List of additional oauth scopes for workers."
   type        = list(string)

google/cluster/configuration.tf

@@ -32,8 +32,9 @@ locals {
 
   cluster_initial_node_count = lookup(local.cfg, "cluster_initial_node_count", 1)
 
-  cluster_min_node_count = lookup(local.cfg, "cluster_min_node_count", 1)
-  cluster_max_node_count = lookup(local.cfg, "cluster_max_node_count", 1)
+  cluster_min_node_count       = lookup(local.cfg, "cluster_min_node_count", 1)
+  cluster_max_node_count       = lookup(local.cfg, "cluster_max_node_count", 1)
+  cluster_node_location_policy = lookup(local.cfg, "cluster_node_location_policy", null)
 
   cluster_extra_oauth_scopes_lookup = lookup(local.cfg, "cluster_extra_oauth_scopes", "")
   cluster_extra_oauth_scopes        = split(",", local.cluster_extra_oauth_scopes_lookup)

google/cluster/main.tf

@@ -30,6 +30,7 @@ module "cluster" {
   initial_node_count = local.cluster_initial_node_count
   min_node_count     = local.cluster_min_node_count
   max_node_count     = local.cluster_max_node_count
+  location_policy    = local.cluster_node_location_policy
 
   extra_oauth_scopes = local.cluster_extra_oauth_scopes
 

google/cluster/node-pool/configuration.tf

@@ -19,6 +19,7 @@ locals {
   initial_node_count = local.cfg["initial_node_count"]
   min_node_count     = local.cfg["min_node_count"]
   max_node_count     = local.cfg["max_node_count"]
+  location_policy    = local.cfg["location_policy"] != null ? local.cfg["location_policy"] : "BALANCED"
 
   disk_size_gb = local.cfg["disk_size_gb"]
   disk_type    = local.cfg["disk_type"]

google/cluster/node-pool/main.tf

@@ -15,6 +15,7 @@ module "node_pool" {
   initial_node_count = local.initial_node_count
   min_node_count     = local.min_node_count
   max_node_count     = local.max_node_count
+  location_policy    = local.location_policy
 
   extra_oauth_scopes = local.extra_oauth_scopes
 

google/cluster/node-pool/variables.tf

@@ -4,8 +4,9 @@ variable "configuration" {
 
     name = optional(string)
 
-    location       = optional(string)
-    node_locations = optional(list(string))
+    location        = optional(string)
+    node_locations  = optional(list(string))
+    location_policy = optional(string)
 
     initial_node_count = optional(string)
     min_node_count     = optional(string)