Declare kubelet_config with dynamic only when cpu_manager_policy is set

terraform-google-modules · Dec 2, 2020 · 4ff4931 · 4ff4931
1 parent 5ba88a6
commit 4ff4931
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -521,8 +521,12 @@ resource "google_container_node_pool" "pools" {
 
     boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
 
-    kubelet_config {
-      cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
+    dynamic "kubelet_config" {
+      for_each = each.value.cpu_manager_policy[*]
+
+      content {
+        cpu_manager_policy = each.value.cpu_manager_policy
+      }
     }
     {% endif %}
 

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -477,8 +477,12 @@ resource "google_container_node_pool" "pools" {
 
     boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
 
-    kubelet_config {
-      cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
+    dynamic "kubelet_config" {
+      for_each = each.value.cpu_manager_policy[*]
+
+      content {
+        cpu_manager_policy = each.value.cpu_manager_policy
+      }
     }
 
     shielded_instance_config {

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -405,8 +405,12 @@ resource "google_container_node_pool" "pools" {
 
     boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
 
-    kubelet_config {
-      cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
+    dynamic "kubelet_config" {
+      for_each = each.value.cpu_manager_policy[*]
+
+      content {
+        cpu_manager_policy = each.value.cpu_manager_policy
+      }
     }
 
     shielded_instance_config {

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -458,8 +458,12 @@ resource "google_container_node_pool" "pools" {
 
     boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
 
-    kubelet_config {
-      cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
+    dynamic "kubelet_config" {
+      for_each = each.value.cpu_manager_policy[*]
+
+      content {
+        cpu_manager_policy = each.value.cpu_manager_policy
+      }
     }
 
     shielded_instance_config {

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -386,8 +386,12 @@ resource "google_container_node_pool" "pools" {
 
     boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
 
-    kubelet_config {
-      cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
+    dynamic "kubelet_config" {
+      for_each = each.value.cpu_manager_policy[*]
+
+      content {
+        cpu_manager_policy = each.value.cpu_manager_policy
+      }
     }
 
     shielded_instance_config {