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.

Sign up for GitHub

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

Jump to bottom

Change container node pool defaults #8967

Merged
merged 3 commits into from
Sep 21, 2023
Merged

Change container node pool defaults #8967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4eed479
Change container node pool defaults
c2thorn Aug 21, 2023
657f2a2
attempt TestAccContainerNodePool_withKubeletConfig fix
c2thorn Sep 20, 2023
b1c8ef0
another fix attempt
c2thorn Sep 20, 2023
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
2 changes: 1 addition & 1 deletion mmv1/third_party/terraform/services/container/node_config.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,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 mmv1/third_party/terraform/services/container/resource_container_node_pool.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,15 +293,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
1 change: 1 addition & 0 deletions mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2614,6 +2614,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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume we have a bunch of tests where this is not set, so we don't need to add one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the majority of tests do not have this set

}
}
`, cluster, np, policy, quota, period, podPidsLimit)
Expand Down
4 changes: 2 additions & 2 deletions mmv1/third_party/terraform/website/docs/r/container_node_pool.html.markdown
View file
Open in desktop
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