Skip to content

Commit efb71a9

Browse files
committed
Make cpu_manager_policy Required
1 parent 58d2ac3 commit efb71a9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Diff for: third_party/terraform/utils/node_config.go.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func schemaNodeConfig() *schema.Schema {
262262
Schema: map[string]*schema.Schema{
263263
"cpu_manager_policy": {
264264
Type: schema.TypeString,
265-
Optional: true,
265+
Required: true,
266266
ValidateFunc: validation.StringInSlice([]string{"static", "none"}, false),
267267
},
268268
"cpu_cfs_quota": {

Diff for: third_party/terraform/website/docs/r/container_cluster.html.markdown

+4-4
Original file line numberDiff line numberDiff line change
@@ -792,9 +792,9 @@ The `workload_metadata_config` block supports:
792792

793793
The `kubelet_config` block supports:
794794

795-
* `cpu_manager_policy` - (Optional) The CPU management policy on the node. See
795+
* `cpu_manager_policy` - (Required) 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 `"none"` or `"static"`. Defaults to `none` when unset.
797+
One of `"none"` or `"static"`. Defaults to `none` when `kubelet_config` is unset.
798798

799799
* `cpu_cfs_quota` - (Optional) If true, enables CPU CFS quota enforcement for
800800
containers that specify CPU limits.
@@ -805,8 +805,8 @@ such as `"300ms"`. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m",
805805
"h". The value must be a positive duration.
806806

807807
-> 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
808+
value and accepts an invalid `default` value instead. While this remains true,
809+
not specifying the `kubelet_config` block should be the equivalent of specifying
810810
`none`.
811811

812812
The `linux_node_config` block supports:

0 commit comments

Comments
 (0)