Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change container node pool defaults #15931

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changelog/8967.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
```release-note:breaking-change
container: removed default for `logging_variant` in `google_container_node_pool`
```
```release-note:breaking-change
container: changed `management.auto_repair` and `management.auto_upgrade` defaults to true in `google_container_node_pool`
```
2 changes: 1 addition & 1 deletion google/services/container/node_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ func schemaLoggingVariant() *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: `Type of logging agent that is used as the default value for node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT.`,
Default: "DEFAULT",
ValidateFunc: validation.StringInSlice([]string{"DEFAULT", "MAX_THROUGHPUT"}, false),
}
}
Expand Down
8 changes: 4 additions & 4 deletions google/services/container/resource_container_node_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,15 +290,15 @@ var schemaNodePool = map[string]*schema.Schema{
"auto_repair": {
Type: schema.TypeBool,
Optional: true,
Default: false,
Description: `Whether the nodes will be automatically repaired.`,
Default: true,
Description: `Whether the nodes will be automatically repaired. Enabled by default.`,
},

"auto_upgrade": {
Type: schema.TypeBool,
Optional: true,
Default: false,
Description: `Whether the nodes will be automatically upgraded.`,
Default: true,
Description: `Whether the nodes will be automatically upgraded. Enabled by default.`,
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2348,6 +2348,7 @@ resource "google_container_node_pool" "with_kubelet_config" {
"https://www.googleapis.com/auth/logging.write",
"https://www.googleapis.com/auth/monitoring",
]
logging_variant = "DEFAULT"
}
}
`, cluster, np, policy, quota, period, podPidsLimit)
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/container_node_pool.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ cluster.

<a name="nested_management"></a>The `management` block supports:

* `auto_repair` - (Optional) Whether the nodes will be automatically repaired.
* `auto_repair` - (Optional) Whether the nodes will be automatically repaired. Enabled by default.

* `auto_upgrade` - (Optional) Whether the nodes will be automatically upgraded.
* `auto_upgrade` - (Optional) Whether the nodes will be automatically upgraded. Enabled by default.

<a name="nested_network_config"></a>The `network_config` block supports:

Expand Down