Skip to content

Commit 62d3a35

Browse files
DrFaust92DrFaust92
committed
add hugepages config + fix cgroup all
Signed-off-by: drfaust92 <[email protected]>
1 parent 6077a5b commit 62d3a35

File tree

19 files changed

+1714
-17
lines changed

19 files changed

+1714
-17
lines changed

‎README.md‎

Lines changed: 161 additions & 0 deletions
Large diffs are not rendered by default.

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,10 +1132,10 @@ resource "google_container_node_pool" "windows_pools" {
11321132
local.node_pools_hugepage_size_1g["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g["all"] },
11331133
local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_hugepage_size_1g[each.value["name"]] },
11341134
)) != 0 ? [1] : []
1135-
1135+
11361136
content {
1137-
hugepage_size_2m = local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? null : local.node_pools_hugepage_size_2m[each.value["name"]]
1138-
hugepage_size_1g = local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? null : local.node_pools_hugepage_size_1g[each.value["name"]]
1137+
hugepage_size_2m = coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]) == "" ? null : coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"])
1138+
hugepage_size_1g = coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]) == "" ? null : coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"])
11391139
}
11401140
}
11411141
}

‎cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,8 +827,8 @@ resource "google_container_node_pool" "pools" {
827827
)) != 0 ? [1] : []
828828

829829
content {
830-
hugepage_size_2m = local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? null : local.node_pools_hugepage_size_2m[each.value["name"]]
831-
hugepage_size_1g = local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? null : local.node_pools_hugepage_size_1g[each.value["name"]]
830+
hugepage_size_2m = coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]) == "" ? null : coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"])
831+
hugepage_size_1g = coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]) == "" ? null : coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"])
832832
}
833833
}
834834
}

‎modules/beta-autopilot-private-cluster/README.md‎

Lines changed: 130 additions & 0 deletions
Large diffs are not rendered by default.

‎modules/beta-autopilot-public-cluster/README.md‎

Lines changed: 122 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 184 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,8 +998,8 @@ resource "google_container_node_pool" "pools" {
998998
)) != 0 ? [1] : []
999999

10001000
content {
1001-
hugepage_size_2m = local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? null : local.node_pools_hugepage_size_2m[each.value["name"]]
1002-
hugepage_size_1g = local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? null : local.node_pools_hugepage_size_1g[each.value["name"]]
1001+
hugepage_size_2m = coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]) == "" ? null : coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"])
1002+
hugepage_size_1g = coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]) == "" ? null : coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"])
10031003
}
10041004
}
10051005
}

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

Lines changed: 184 additions & 0 deletions
Large diffs are not rendered by default.

‎modules/beta-private-cluster/cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,8 +917,8 @@ resource "google_container_node_pool" "pools" {
917917
)) != 0 ? [1] : []
918918

919919
content {
920-
hugepage_size_2m = local.node_pools_hugepage_size_2m[each.value["name"]] == "" ? null : local.node_pools_hugepage_size_2m[each.value["name"]]
921-
hugepage_size_1g = local.node_pools_hugepage_size_1g[each.value["name"]] == "" ? null : local.node_pools_hugepage_size_1g[each.value["name"]]
920+
hugepage_size_2m = coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]) == "" ? null : coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"])
921+
hugepage_size_1g = coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]) == "" ? null : coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"])
922922
}
923923
}
924924
}

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

Lines changed: 176 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)