feat(Hugepages_config): Support hugepages configuration in linux nodepools

README.md

@@ -226,6 +226,7 @@ Then perform the following commands on the root folder:
 | node\_metadata | Specifies how node metadata is exposed to the workload running on the node | `string` | `"GKE_METADATA"` | no |
 | node\_pools | List of maps containing node pools | `list(map(any))` | <pre>[<br>  {<br>    "name": "default-node-pool"<br>  }<br>]</pre> | no |
 | node\_pools\_cgroup\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br>  "all": "",<br>  "default-node-pool": ""<br>}</pre> | no |
+| node\_pools\_hugepages\_configs | Map of maps containing hugepage config by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |

autogen/main/cluster.tf.tmpl

@@ -1162,7 +1162,10 @@ resource "google_container_node_pool" "windows_pools" {
         local.node_pools_linux_node_configs_sysctls["all"],
         local.node_pools_linux_node_configs_sysctls[each.value["name"]],
         local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
-        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : {cgroup = local.node_pools_cgroup_mode[each.value["name"]]}
+        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : {cgroup = local.node_pools_cgroup_mode[each.value["name"]]},    
+        local.node_pools_linux_node_hugepages_configs["all"],
+        local.node_pools_linux_node_hugepages_configs[each.value["name"]],
+
       )) != 0 ? [1] : []
 
       content {
@@ -1171,6 +1174,13 @@ resource "google_container_node_pool" "windows_pools" {
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
         cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+
+        hugepages_config {
+          hugepage_size_2m = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_2m"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_2m"], null))
+          hugepage_size_1g = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_1g"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_1g"], null))
+
+        }
+
       }
     }
     {% endif %}

autogen/main/variables.tf.tmpl

@@ -265,6 +265,17 @@ variable "node_pools_cgroup_mode" {
     default-node-pool = ""
   }
 }
+
+variable "node_pools_hugepages_configs" {
+  type        = map(map(string))
+  description = "Map of maps containing hugepage config by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = {}
+    default-node-pool = {}
+  }
+}
 {% endif %}
 
 variable "enable_cost_allocation" {

autogen/main/variables_defaults.tf.tmpl

@@ -138,5 +138,14 @@ locals {
    ),
    var.node_pools_cgroup_mode
   )
+  node_pools_linux_node_hugepages_configs = merge(
+  { all = {} },
+  { default-node-pool = {} },
+  zipmap(
+    [for node_pool in var.node_pools : node_pool["name"]],
+    [for node_pool in var.node_pools : {}]
+  ),
+  var.node_pools_hugepages_configs
+  )
 }
 {% endif %}

cluster.tf

@@ -853,7 +853,10 @@ resource "google_container_node_pool" "pools" {
         local.node_pools_linux_node_configs_sysctls["all"],
         local.node_pools_linux_node_configs_sysctls[each.value["name"]],
         local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
-        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
+        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] },
+        local.node_pools_linux_node_hugepages_configs["all"],
+        local.node_pools_linux_node_hugepages_configs[each.value["name"]],
+
       )) != 0 ? [1] : []
 
       content {
@@ -862,6 +865,13 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
         cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+
+        hugepages_config {
+          hugepage_size_2m = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_2m"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_2m"], null))
+          hugepage_size_1g = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_1g"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_1g"], null))
+
+        }
+
       }
     }
 

examples/node_pool/main.tf

@@ -164,6 +164,8 @@ module "gke" {
     all     = "CGROUP_MODE_V1"
     pool-01 = "CGROUP_MODE_V2"
   }
+
+
 }
 
 resource "google_compute_node_template" "soletenant-tmpl" {

modules/beta-private-cluster-update-variant/README.md

@@ -269,6 +269,7 @@ Then perform the following commands on the root folder:
 | node\_metadata | Specifies how node metadata is exposed to the workload running on the node | `string` | `"GKE_METADATA"` | no |
 | node\_pools | List of maps containing node pools | `list(map(any))` | <pre>[<br>  {<br>    "name": "default-node-pool"<br>  }<br>]</pre> | no |
 | node\_pools\_cgroup\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br>  "all": "",<br>  "default-node-pool": ""<br>}</pre> | no |
+| node\_pools\_hugepages\_configs | Map of maps containing hugepage config by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |

modules/beta-private-cluster-update-variant/cluster.tf

@@ -1016,7 +1016,10 @@ resource "google_container_node_pool" "pools" {
         local.node_pools_linux_node_configs_sysctls["all"],
         local.node_pools_linux_node_configs_sysctls[each.value["name"]],
         local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
-        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
+        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] },
+        local.node_pools_linux_node_hugepages_configs["all"],
+        local.node_pools_linux_node_hugepages_configs[each.value["name"]],
+
       )) != 0 ? [1] : []
 
       content {
@@ -1025,6 +1028,13 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
         cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+
+        hugepages_config {
+          hugepage_size_2m = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_2m"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_2m"], null))
+          hugepage_size_1g = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_1g"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_1g"], null))
+
+        }
+
       }
     }
 

modules/beta-private-cluster-update-variant/variables.tf

@@ -246,6 +246,17 @@ variable "node_pools_cgroup_mode" {
   }
 }
 
+variable "node_pools_hugepages_configs" {
+  type        = map(map(string))
+  description = "Map of maps containing hugepage config by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = {}
+    default-node-pool = {}
+  }
+}
+
 variable "enable_cost_allocation" {
   type        = bool
   description = "Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery"

modules/beta-private-cluster-update-variant/variables_defaults.tf

@@ -137,4 +137,13 @@ locals {
     ),
     var.node_pools_cgroup_mode
   )
+  node_pools_linux_node_hugepages_configs = merge(
+    { all = {} },
+    { default-node-pool = {} },
+    zipmap(
+      [for node_pool in var.node_pools : node_pool["name"]],
+      [for node_pool in var.node_pools : {}]
+    ),
+    var.node_pools_hugepages_configs
+  )
 }

modules/beta-private-cluster/README.md

@@ -247,6 +247,7 @@ Then perform the following commands on the root folder:
 | node\_metadata | Specifies how node metadata is exposed to the workload running on the node | `string` | `"GKE_METADATA"` | no |
 | node\_pools | List of maps containing node pools | `list(map(any))` | <pre>[<br>  {<br>    "name": "default-node-pool"<br>  }<br>]</pre> | no |
 | node\_pools\_cgroup\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br>  "all": "",<br>  "default-node-pool": ""<br>}</pre> | no |
+| node\_pools\_hugepages\_configs | Map of maps containing hugepage config by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |

modules/beta-private-cluster/cluster.tf

@@ -935,7 +935,10 @@ resource "google_container_node_pool" "pools" {
         local.node_pools_linux_node_configs_sysctls["all"],
         local.node_pools_linux_node_configs_sysctls[each.value["name"]],
         local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
-        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
+        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] },
+        local.node_pools_linux_node_hugepages_configs["all"],
+        local.node_pools_linux_node_hugepages_configs[each.value["name"]],
+
       )) != 0 ? [1] : []
 
       content {
@@ -944,6 +947,13 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
         cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+
+        hugepages_config {
+          hugepage_size_2m = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_2m"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_2m"], null))
+          hugepage_size_1g = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_1g"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_1g"], null))
+
+        }
+
       }
     }
 

modules/beta-private-cluster/variables.tf

@@ -246,6 +246,17 @@ variable "node_pools_cgroup_mode" {
   }
 }
 
+variable "node_pools_hugepages_configs" {
+  type        = map(map(string))
+  description = "Map of maps containing hugepage config by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = {}
+    default-node-pool = {}
+  }
+}
+
 variable "enable_cost_allocation" {
   type        = bool
   description = "Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery"

modules/beta-private-cluster/variables_defaults.tf

@@ -137,4 +137,13 @@ locals {
     ),
     var.node_pools_cgroup_mode
   )
+  node_pools_linux_node_hugepages_configs = merge(
+    { all = {} },
+    { default-node-pool = {} },
+    zipmap(
+      [for node_pool in var.node_pools : node_pool["name"]],
+      [for node_pool in var.node_pools : {}]
+    ),
+    var.node_pools_hugepages_configs
+  )
 }

modules/beta-public-cluster-update-variant/README.md

@@ -259,6 +259,7 @@ Then perform the following commands on the root folder:
 | node\_metadata | Specifies how node metadata is exposed to the workload running on the node | `string` | `"GKE_METADATA"` | no |
 | node\_pools | List of maps containing node pools | `list(map(any))` | <pre>[<br>  {<br>    "name": "default-node-pool"<br>  }<br>]</pre> | no |
 | node\_pools\_cgroup\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br>  "all": "",<br>  "default-node-pool": ""<br>}</pre> | no |
+| node\_pools\_hugepages\_configs | Map of maps containing hugepage config by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |

modules/beta-public-cluster-update-variant/cluster.tf

@@ -993,7 +993,10 @@ resource "google_container_node_pool" "pools" {
         local.node_pools_linux_node_configs_sysctls["all"],
         local.node_pools_linux_node_configs_sysctls[each.value["name"]],
         local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
-        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
+        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] },
+        local.node_pools_linux_node_hugepages_configs["all"],
+        local.node_pools_linux_node_hugepages_configs[each.value["name"]],
+
       )) != 0 ? [1] : []
 
       content {
@@ -1002,6 +1005,13 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
         cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+
+        hugepages_config {
+          hugepage_size_2m = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_2m"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_2m"], null))
+          hugepage_size_1g = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_1g"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_1g"], null))
+
+        }
+
       }
     }
 

modules/beta-public-cluster-update-variant/variables.tf

@@ -246,6 +246,17 @@ variable "node_pools_cgroup_mode" {
   }
 }
 
+variable "node_pools_hugepages_configs" {
+  type        = map(map(string))
+  description = "Map of maps containing hugepage config by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = {}
+    default-node-pool = {}
+  }
+}
+
 variable "enable_cost_allocation" {
   type        = bool
   description = "Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery"

modules/beta-public-cluster-update-variant/variables_defaults.tf

@@ -137,4 +137,13 @@ locals {
     ),
     var.node_pools_cgroup_mode
   )
+  node_pools_linux_node_hugepages_configs = merge(
+    { all = {} },
+    { default-node-pool = {} },
+    zipmap(
+      [for node_pool in var.node_pools : node_pool["name"]],
+      [for node_pool in var.node_pools : {}]
+    ),
+    var.node_pools_hugepages_configs
+  )
 }

modules/beta-public-cluster/README.md

@@ -237,6 +237,7 @@ Then perform the following commands on the root folder:
 | node\_metadata | Specifies how node metadata is exposed to the workload running on the node | `string` | `"GKE_METADATA"` | no |
 | node\_pools | List of maps containing node pools | `list(map(any))` | <pre>[<br>  {<br>    "name": "default-node-pool"<br>  }<br>]</pre> | no |
 | node\_pools\_cgroup\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br>  "all": "",<br>  "default-node-pool": ""<br>}</pre> | no |
+| node\_pools\_hugepages\_configs | Map of maps containing hugepage config by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br>  "all": {},<br>  "default-node-pool": {}<br>}</pre> | no |

modules/beta-public-cluster/cluster.tf

@@ -912,7 +912,10 @@ resource "google_container_node_pool" "pools" {
         local.node_pools_linux_node_configs_sysctls["all"],
         local.node_pools_linux_node_configs_sysctls[each.value["name"]],
         local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
-        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
+        local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] },
+        local.node_pools_linux_node_hugepages_configs["all"],
+        local.node_pools_linux_node_hugepages_configs[each.value["name"]],
+
       )) != 0 ? [1] : []
 
       content {
@@ -921,6 +924,13 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
         cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+
+        hugepages_config {
+          hugepage_size_2m = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_2m"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_2m"], null))
+          hugepage_size_1g = try(local.node_pools_linux_node_hugepages_configs[each.value["name"]]["hugepage_size_1g"], try(local.node_pools_linux_node_hugepages_configs["all"]["hugepage_size_1g"], null))
+
+        }
+
       }
     }
 

modules/beta-public-cluster/variables.tf

@@ -246,6 +246,17 @@ variable "node_pools_cgroup_mode" {
   }
 }
 
+variable "node_pools_hugepages_configs" {
+  type        = map(map(string))
+  description = "Map of maps containing hugepage config by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = {}
+    default-node-pool = {}
+  }
+}
+
 variable "enable_cost_allocation" {
   type        = bool
   description = "Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery"

modules/beta-public-cluster/variables_defaults.tf

@@ -137,4 +137,13 @@ locals {
     ),
     var.node_pools_cgroup_mode
   )
+  node_pools_linux_node_hugepages_configs = merge(
+    { all = {} },
+    { default-node-pool = {} },
+    zipmap(
+      [for node_pool in var.node_pools : node_pool["name"]],
+      [for node_pool in var.node_pools : {}]
+    ),
+    var.node_pools_hugepages_configs
+  )
 }