Define kubelet_config in beta

terraform-google-modules · Nov 29, 2020 · 5ba88a6 · 5ba88a6
1 parent 6c52d87
commit 5ba88a6
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -212,7 +212,6 @@ The node_pools variable takes the following parameters:
 | auto_repair | Whether the nodes will be automatically repaired | true | Optional |
 | autoscaling | Configuration required by cluster autoscaler to adjust the size of the node pool to the current cluster usage | true | Optional |
 | auto_upgrade | Whether the nodes will be automatically upgraded | true (if cluster is regional) | Optional |
-| cpu_manager_policy | The CPU manager policy on the node. One of "none" or "static". | "none" | Optional |
 | disk_size_gb | Size of the disk attached to each node, specified in GB. The smallest allowed disk size is 10GB | 100 | Optional |
 | disk_type | Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd') | pd-standard | Optional |
 | effect | Effect for the taint | | Required |

diff --git a/autogen/main/README.md b/autogen/main/README.md
@@ -161,7 +161,9 @@ The node_pools variable takes the following parameters:
 | auto_repair | Whether the nodes will be automatically repaired | true | Optional |
 | autoscaling | Configuration required by cluster autoscaler to adjust the size of the node pool to the current cluster usage | true | Optional |
 | auto_upgrade | Whether the nodes will be automatically upgraded | true (if cluster is regional) | Optional |
+{% if beta_cluster %}
 | cpu_manager_policy | The CPU manager policy on the node. One of "none" or "static". | "none" | Optional |
+{% endif %}
 | disk_size_gb | Size of the disk attached to each node, specified in GB. The smallest allowed disk size is 10GB | 100 | Optional |
 | disk_type | Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd') | pd-standard | Optional |
 | effect | Effect for the taint | | Required |

diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -237,10 +237,6 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
-
-      kubelet_config {
-        cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
-      }
     }
   }
 
@@ -524,6 +520,10 @@ 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")
+    }
     {% endif %}
 
     shielded_instance_config {

diff --git a/cluster.tf b/cluster.tf
@@ -143,10 +143,6 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
-
-      kubelet_config {
-        cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
-      }
     }
   }
 

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -212,10 +212,6 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
-
-      kubelet_config {
-        cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
-      }
     }
   }
 
@@ -481,6 +477,10 @@ 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")
+    }
+
     shielded_instance_config {
       enable_secure_boot          = lookup(each.value, "enable_secure_boot", false)
       enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -212,10 +212,6 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
-
-      kubelet_config {
-        cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
-      }
     }
   }
 
@@ -409,6 +405,10 @@ 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")
+    }
+
     shielded_instance_config {
       enable_secure_boot          = lookup(each.value, "enable_secure_boot", false)
       enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -212,10 +212,6 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
-
-      kubelet_config {
-        cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
-      }
     }
   }
 
@@ -462,6 +458,10 @@ 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")
+    }
+
     shielded_instance_config {
       enable_secure_boot          = lookup(each.value, "enable_secure_boot", false)
       enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -212,10 +212,6 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
-
-      kubelet_config {
-        cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
-      }
     }
   }
 
@@ -390,6 +386,10 @@ 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")
+    }
+
     shielded_instance_config {
       enable_secure_boot          = lookup(each.value, "enable_secure_boot", false)
       enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)

diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
@@ -246,7 +246,6 @@ The node_pools variable takes the following parameters:
 | auto_repair | Whether the nodes will be automatically repaired | true | Optional |
 | autoscaling | Configuration required by cluster autoscaler to adjust the size of the node pool to the current cluster usage | true | Optional |
 | auto_upgrade | Whether the nodes will be automatically upgraded | true (if cluster is regional) | Optional |
-| cpu_manager_policy | The CPU manager policy on the node. One of "none" or "static". | "none" | Optional |
 | disk_size_gb | Size of the disk attached to each node, specified in GB. The smallest allowed disk size is 10GB | 100 | Optional |
 | disk_type | Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd') | pd-standard | Optional |
 | effect | Effect for the taint | | Required |

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -143,10 +143,6 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
-
-      kubelet_config {
-        cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
-      }
     }
   }
 

diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -224,7 +224,6 @@ The node_pools variable takes the following parameters:
 | auto_repair | Whether the nodes will be automatically repaired | true | Optional |
 | autoscaling | Configuration required by cluster autoscaler to adjust the size of the node pool to the current cluster usage | true | Optional |
 | auto_upgrade | Whether the nodes will be automatically upgraded | true (if cluster is regional) | Optional |
-| cpu_manager_policy | The CPU manager policy on the node. One of "none" or "static". | "none" | Optional |
 | disk_size_gb | Size of the disk attached to each node, specified in GB. The smallest allowed disk size is 10GB | 100 | Optional |
 | disk_type | Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd') | pd-standard | Optional |
 | effect | Effect for the taint | | Required |

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -143,10 +143,6 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
-
-      kubelet_config {
-        cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "none")
-      }
     }
   }