Skip to content

Commit cf71718

Browse files
DrFaust92DrFaust92
authored
feat: add support for hugepages_config (#2223)
Signed-off-by: drfaust92 <[email protected]>
1 parent 132a981 commit cf71718

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+649
-11
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ Then perform the following commands on the root folder:
229229
| node\_metadata | Specifies how node metadata is exposed to the workload running on the node | `string` | `"GKE_METADATA"` | no |
230230
| node\_pools | List of maps containing node pools | `list(map(any))` | <pre>[<br> {<br> "name": "default-node-pool"<br> }<br>]</pre> | no |
231231
| 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 |
232+
| node\_pools\_hugepage\_size\_1g | Map of strings containing hugepage size 1g config by node-pool name | `map(string)` | <pre>{<br> "all": "",<br> "default-node-pool": ""<br>}</pre> | no |
233+
| node\_pools\_hugepage\_size\_2m | Map of strings containing hugepage size 2m node config by node-pool name | `map(string)` | <pre>{<br> "all": "",<br> "default-node-pool": ""<br>}</pre> | no |
232234
| 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 |
233235
| 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 |
234236
| 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‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,11 @@ resource "google_container_node_pool" "windows_pools" {
12051205
local.node_pools_linux_node_configs_sysctls["all"],
12061206
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
12071207
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
1208-
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : {cgroup = local.node_pools_cgroup_mode[each.value["name"]]}
1208+
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : {cgroup = local.node_pools_cgroup_mode[each.value["name"]]},
1209+
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
1210+
local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m[each.value["name"]] },
1211+
local.node_pools_hugepage_size_1g["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g["all"] },
1212+
local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g[each.value["name"]] },
12091213
)) != 0 ? [1] : []
12101214

12111215
content {
@@ -1214,6 +1218,19 @@ resource "google_container_node_pool" "windows_pools" {
12141218
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
12151219
)
12161220
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
1221+
dynamic "hugepages_config" {
1222+
for_each = length(merge(
1223+
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
1224+
local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m[each.value["name"]] },
1225+
local.node_pools_hugepage_size_1g["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g["all"] },
1226+
local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g[each.value["name"]] },
1227+
)) != 0 ? [1] : []
1228+
1229+
content {
1230+
hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]), null)
1231+
hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]), null)
1232+
}
1233+
}
12171234
}
12181235
}
12191236
{% endif %}

‎autogen/main/variables.tf.tmpl‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,28 @@ variable "node_pools_cgroup_mode" {
265265
default-node-pool = ""
266266
}
267267
}
268+
269+
variable "node_pools_hugepage_size_2m" {
270+
type = map(string)
271+
description = "Map of strings containing hugepage size 2m node config by node-pool name"
272+
273+
# Default is being set in variables_defaults.tf
274+
default = {
275+
all = ""
276+
default-node-pool = ""
277+
}
278+
}
279+
280+
variable "node_pools_hugepage_size_1g" {
281+
type = map(string)
282+
description = "Map of strings containing hugepage size 1g config by node-pool name"
283+
284+
# Default is being set in variables_defaults.tf
285+
default = {
286+
all = ""
287+
default-node-pool = ""
288+
}
289+
}
268290
{% endif %}
269291

270292
variable "enable_cost_allocation" {

‎autogen/main/variables_defaults.tf.tmpl‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,25 @@ locals {
138138
),
139139
var.node_pools_cgroup_mode
140140
)
141+
142+
node_pools_hugepage_size_2m = merge(
143+
{ all = "" },
144+
{ default-node-pool = "" },
145+
zipmap(
146+
[for node_pool in var.node_pools : node_pool["name"]],
147+
[for node_pool in var.node_pools : ""]
148+
),
149+
var.node_pools_hugepage_size_2m
150+
)
151+
152+
node_pools_hugepage_size_1g = merge(
153+
{ all = "" },
154+
{ default-node-pool = "" },
155+
zipmap(
156+
[for node_pool in var.node_pools : node_pool["name"]],
157+
[for node_pool in var.node_pools : ""]
158+
),
159+
var.node_pools_hugepage_size_1g
160+
)
141161
}
142162
{% endif %}

‎cluster.tf‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,11 @@ resource "google_container_node_pool" "pools" {
890890
local.node_pools_linux_node_configs_sysctls["all"],
891891
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
892892
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
893-
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
893+
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] },
894+
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
895+
local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m[each.value["name"]] },
896+
local.node_pools_hugepage_size_1g["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g["all"] },
897+
local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g[each.value["name"]] },
894898
)) != 0 ? [1] : []
895899

896900
content {
@@ -899,6 +903,19 @@ resource "google_container_node_pool" "pools" {
899903
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
900904
)
901905
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
906+
dynamic "hugepages_config" {
907+
for_each = length(merge(
908+
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
909+
local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m[each.value["name"]] },
910+
local.node_pools_hugepage_size_1g["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g["all"] },
911+
local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g[each.value["name"]] },
912+
)) != 0 ? [1] : []
913+
914+
content {
915+
hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]), null)
916+
hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]), null)
917+
}
918+
}
902919
}
903920
}
904921

‎examples/node_pool/main.tf‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ module "gke" {
9696
},
9797
{
9898
name = "pool-05"
99-
machine_type = "n1-standard-2"
99+
disk_type = "pd-balanced"
100+
machine_type = "c3-standard-4"
100101
node_count = 1
101102
enable_nested_virtualization = true
102103
},
@@ -165,6 +166,15 @@ module "gke" {
165166
all = "CGROUP_MODE_V1"
166167
pool-01 = "CGROUP_MODE_V2"
167168
}
169+
170+
node_pools_hugepage_size_2m = {
171+
all = "1"
172+
pool-01 = "2"
173+
}
174+
175+
node_pools_hugepage_size_1g = {
176+
pool-05 = "2"
177+
}
168178
}
169179

170180
resource "google_compute_node_template" "soletenant-tmpl" {

‎metadata.display.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,12 @@ spec:
294294
node_pools_cgroup_mode:
295295
name: node_pools_cgroup_mode
296296
title: Node Pools Cgroup Mode
297+
node_pools_hugepage_size_1g:
298+
name: node_pools_hugepage_size_1g
299+
title: Node Pools Hugepage Size 1G
300+
node_pools_hugepage_size_2m:
301+
name: node_pools_hugepage_size_2m
302+
title: Node Pools Hugepage Size 2M
297303
node_pools_labels:
298304
name: node_pools_labels
299305
title: Node Pools Labels

‎metadata.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,18 @@ spec:
300300
defaultValue:
301301
all: ""
302302
default-node-pool: ""
303+
- name: node_pools_hugepage_size_2m
304+
description: Map of strings containing hugepage size 2m node config by node-pool name
305+
varType: map(string)
306+
defaultValue:
307+
all: ""
308+
default-node-pool: ""
309+
- name: node_pools_hugepage_size_1g
310+
description: Map of strings containing hugepage size 1g config by node-pool name
311+
varType: map(string)
312+
defaultValue:
313+
all: ""
314+
default-node-pool: ""
303315
- name: enable_cost_allocation
304316
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
305317
varType: bool

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ Then perform the following commands on the root folder:
274274
| node\_metadata | Specifies how node metadata is exposed to the workload running on the node | `string` | `"GKE_METADATA"` | no |
275275
| node\_pools | List of maps containing node pools | `list(map(any))` | <pre>[<br> {<br> "name": "default-node-pool"<br> }<br>]</pre> | no |
276276
| 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 |
277+
| node\_pools\_hugepage\_size\_1g | Map of strings containing hugepage size 1g config by node-pool name | `map(string)` | <pre>{<br> "all": "",<br> "default-node-pool": ""<br>}</pre> | no |
278+
| node\_pools\_hugepage\_size\_2m | Map of strings containing hugepage size 2m node config by node-pool name | `map(string)` | <pre>{<br> "all": "",<br> "default-node-pool": ""<br>}</pre> | no |
277279
| 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 |
278280
| 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 |
279281
| 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‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,11 @@ resource "google_container_node_pool" "pools" {
10591059
local.node_pools_linux_node_configs_sysctls["all"],
10601060
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
10611061
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
1062-
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
1062+
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] },
1063+
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
1064+
local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m[each.value["name"]] },
1065+
local.node_pools_hugepage_size_1g["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g["all"] },
1066+
local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g[each.value["name"]] },
10631067
)) != 0 ? [1] : []
10641068

10651069
content {
@@ -1068,6 +1072,19 @@ resource "google_container_node_pool" "pools" {
10681072
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10691073
)
10701074
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
1075+
dynamic "hugepages_config" {
1076+
for_each = length(merge(
1077+
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
1078+
local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m[each.value["name"]] },
1079+
local.node_pools_hugepage_size_1g["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g["all"] },
1080+
local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g[each.value["name"]] },
1081+
)) != 0 ? [1] : []
1082+
1083+
content {
1084+
hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]), null)
1085+
hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]), null)
1086+
}
1087+
}
10711088
}
10721089
}
10731090

0 commit comments

Comments
 (0)