Skip to content

Commit 15e7a64

Browse files
committed
feat(safer-cluster): add some missing variables
- node_pools_resource_manager_tags - node_pools_linux_node_configs_sysctls - node_pools_cgroup_mode - node_pools_hugepage_size_2m - node_pools_hugepage_size_1g - enable_secret_manager_addon
1 parent 6967a8f commit 15e7a64

File tree

2 files changed

+74
-7
lines changed

2 files changed

+74
-7
lines changed

autogen/safer-cluster/main.tf.tmpl

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,18 @@ module "gke" {
8989
// If removing the default node pool, initial_node_count should be at least 1.
9090
initial_node_count = (var.initial_node_count == 0) ? 1 : var.initial_node_count
9191

92-
node_pools = var.node_pools
93-
windows_node_pools = var.windows_node_pools
94-
node_pools_labels = var.node_pools_labels
95-
node_pools_resource_labels = var.node_pools_resource_labels
96-
node_pools_metadata = var.node_pools_metadata
97-
node_pools_taints = var.node_pools_taints
98-
node_pools_tags = var.node_pools_tags
92+
node_pools = var.node_pools
93+
windows_node_pools = var.windows_node_pools
94+
node_pools_labels = var.node_pools_labels
95+
node_pools_resource_labels = var.node_pools_resource_labels
96+
node_pools_resource_manager_tags = var.node_pools_resource_manager_tags
97+
node_pools_metadata = var.node_pools_metadata
98+
node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls
99+
node_pools_cgroup_mode = var.node_pools_cgroup_mode
100+
node_pools_hugepage_size_2m = var.node_pools_hugepage_size_2m
101+
node_pools_hugepage_size_1g = var.node_pools_hugepage_size_1g
102+
node_pools_taints = var.node_pools_taints
103+
node_pools_tags = var.node_pools_tags
99104

100105
node_pools_oauth_scopes = var.node_pools_oauth_scopes
101106

@@ -216,6 +221,8 @@ module "gke" {
216221

217222
enable_gcfs = var.enable_gcfs
218223

224+
enable_secret_manager_addon = var.enable_secret_manager_addon
225+
219226
// Enabling vulnerability and audit for workloads
220227
workload_vulnerability_mode = var.workload_vulnerability_mode
221228
workload_config_audit_mode = var.workload_config_audit_mode

autogen/safer-cluster/variables.tf.tmpl

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,16 @@ variable "node_pools_resource_labels" {
185185
}
186186
}
187187

188+
variable "node_pools_resource_manager_tags" {
189+
type = map(map(string))
190+
description = "Map of maps containing resource manager tags by node-pool name"
191+
192+
default = {
193+
all = {}
194+
default-node-pool = {}
195+
}
196+
}
197+
188198
variable "node_pools_metadata" {
189199
type = map(map(string))
190200
description = "Map of maps containing node metadata by node-pool name"
@@ -195,6 +205,50 @@ variable "node_pools_metadata" {
195205
}
196206
}
197207

208+
variable "node_pools_linux_node_configs_sysctls" {
209+
type = map(map(string))
210+
description = "Map of maps containing linux node config sysctls by node-pool name"
211+
212+
# Default is being set in variables_defaults.tf
213+
default = {
214+
all = {}
215+
default-node-pool = {}
216+
}
217+
}
218+
219+
variable "node_pools_cgroup_mode" {
220+
type = map(string)
221+
description = "Map of strings containing cgroup node config by node-pool name"
222+
223+
# Default is being set in variables_defaults.tf
224+
default = {
225+
all = ""
226+
default-node-pool = ""
227+
}
228+
}
229+
230+
variable "node_pools_hugepage_size_2m" {
231+
type = map(string)
232+
description = "Map of strings containing hugepage size 2m node config by node-pool name"
233+
234+
# Default is being set in variables_defaults.tf
235+
default = {
236+
all = ""
237+
default-node-pool = ""
238+
}
239+
}
240+
241+
variable "node_pools_hugepage_size_1g" {
242+
type = map(string)
243+
description = "Map of strings containing hugepage size 1g config by node-pool name"
244+
245+
# Default is being set in variables_defaults.tf
246+
default = {
247+
all = ""
248+
default-node-pool = ""
249+
}
250+
}
251+
198252
variable "node_pools_taints" {
199253
type = map(list(object({ key = string, value = string, effect = string })))
200254
description = "Map of lists containing node taints by node-pool name"
@@ -540,6 +594,12 @@ variable "enable_gcfs" {
540594
default = false
541595
}
542596

597+
variable "enable_secret_manager_addon" {
598+
description = "Enable the Secret Manager add-on for this cluster"
599+
type = bool
600+
default = false
601+
}
602+
543603
variable "enable_mesh_certificates" {
544604
type = bool
545605
default = false

0 commit comments

Comments
 (0)