feat: add cgroup & sysctls

terraform-google-modules · Dec 11, 2024 · 67dd293 · 67dd293
1 parent fa5202b
commit 67dd293
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 2 deletions.
diff --git a/modules/safer-cluster-update-variant/main.tf b/modules/safer-cluster-update-variant/main.tf
@@ -93,7 +93,9 @@ module "gke" {
   node_pools_taints          = var.node_pools_taints
   node_pools_tags            = var.node_pools_tags
 
-  node_pools_oauth_scopes = var.node_pools_oauth_scopes
+  node_pools_oauth_scopes               = var.node_pools_oauth_scopes
+  node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls
+  node_pools_cgroup_mode                = var.node_pools_cgroup_mode
 
   cluster_autoscaling = var.cluster_autoscaling
 

diff --git a/modules/safer-cluster-update-variant/variables.tf b/modules/safer-cluster-update-variant/variables.tf
@@ -224,6 +224,27 @@ variable "node_pools_oauth_scopes" {
   }
 }
 
+variable "node_pools_linux_node_configs_sysctls" {
+  type        = map(map(string))
+  description = "Map of maps containing linux node config sysctls by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = {}
+    default-node-pool = {}
+  }
+}
+variable "node_pools_cgroup_mode" {
+  type        = map(string)
+  description = "Map of strings containing cgroup node config by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = ""
+    default-node-pool = ""
+  }
+}
+
 variable "cluster_autoscaling" {
   type = object({
     enabled             = bool

diff --git a/modules/safer-cluster/main.tf b/modules/safer-cluster/main.tf
@@ -93,7 +93,9 @@ module "gke" {
   node_pools_taints          = var.node_pools_taints
   node_pools_tags            = var.node_pools_tags
 
-  node_pools_oauth_scopes = var.node_pools_oauth_scopes
+  node_pools_oauth_scopes               = var.node_pools_oauth_scopes
+  node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls
+  node_pools_cgroup_mode                = var.node_pools_cgroup_mode
 
   cluster_autoscaling = var.cluster_autoscaling
 

diff --git a/modules/safer-cluster/variables.tf b/modules/safer-cluster/variables.tf
@@ -224,6 +224,27 @@ variable "node_pools_oauth_scopes" {
   }
 }
 
+variable "node_pools_linux_node_configs_sysctls" {
+  type        = map(map(string))
+  description = "Map of maps containing linux node config sysctls by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = {}
+    default-node-pool = {}
+  }
+}
+variable "node_pools_cgroup_mode" {
+  type        = map(string)
+  description = "Map of strings containing cgroup node config by node-pool name"
+
+  # Default is being set in variables_defaults.tf
+  default = {
+    all               = ""
+    default-node-pool = ""
+  }
+}
+
 variable "cluster_autoscaling" {
   type = object({
     enabled             = bool