Skip to content

Commit 58d2ac3

Browse files
committed
Change to the none value.
1 parent 163a359 commit 58d2ac3

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

third_party/terraform/tests/resource_container_node_pool_test.go.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ func TestAccContainerNodePool_withKubeletConfig(t *testing.T) {
261261
ImportStateVerify: true,
262262
},
263263
{
264-
Config: testAccContainerNodePool_withKubeletConfig(cluster, np, "default", "200us", true),
264+
Config: testAccContainerNodePool_withKubeletConfig(cluster, np, "static", "200us", true),
265265
},
266266
{
267267
ResourceName: "google_container_node_pool.with_kubelet_config",

third_party/terraform/utils/node_config.go.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ func schemaNodeConfig() *schema.Schema {
263263
"cpu_manager_policy": {
264264
Type: schema.TypeString,
265265
Optional: true,
266-
ValidateFunc: validation.StringInSlice([]string{"static", "default"}, false),
266+
ValidateFunc: validation.StringInSlice([]string{"static", "none"}, false),
267267
},
268268
"cpu_cfs_quota": {
269269
Type: schema.TypeBool,

third_party/terraform/website/docs/r/container_cluster.html.markdown

+6-1
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ The `kubelet_config` block supports:
794794

795795
* `cpu_manager_policy` - (Optional) The CPU management policy on the node. See
796796
[K8S CPU Management Policies](https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/).
797-
One of `"default"` or `"static"`.
797+
One of `"none"` or `"static"`. Defaults to `none` when unset.
798798

799799
* `cpu_cfs_quota` - (Optional) If true, enables CPU CFS quota enforcement for
800800
containers that specify CPU limits.
@@ -804,6 +804,11 @@ as a sequence of decimal numbers, each with optional fraction and a unit suffix,
804804
such as `"300ms"`. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m",
805805
"h". The value must be a positive duration.
806806

807+
-> Note: At the time of writing (2020/08/18) the GKE API rejects the `none`
808+
value and accepts an invalid `default` value. While this remains true, not
809+
specifying the `kubelet_config` block should be the equivalent of specifying
810+
`none`.
811+
807812
The `linux_node_config` block supports:
808813

809814
* `sysctls` - (Required) The Linux kernel parameters to be applied to the nodes

0 commit comments

Comments
 (0)