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

Add supported values of APISERVER, CONTROLLER_MANAGER, and SCHEDULER to monitoring_config #4565

Merged
merged 1 commit into from
Aug 3, 2022
Merged

Add supported values of APISERVER, CONTROLLER_MANAGER, and SCHEDULER to monitoring_config #4565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .changelog/6352.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
container: added support for additional values `APISERVER`, `CONTROLLER_MANAGER`, and `SCHEDULER` in `google_container_cluster.monitoring_config`
```
4 changes: 2 additions & 2 deletions google-beta/resource_container_cluster.go
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,10 +788,10 @@ func resourceContainerCluster() *schema.Resource {
Type: schema.TypeList,
Optional: true,
Computed: true,
Description: `GKE components exposing metrics. Valid values include SYSTEM_COMPONENTS and WORKLOADS.`,
Description: `GKE components exposing metrics. Valid values include SYSTEM_COMPONENTS, APISERVER, CONTROLLER_MANAGER, SCHEDULER, and WORKLOADS.`,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS", "WORKLOADS"}, false),
ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "WORKLOADS"}, false),
},
},
"managed_prometheus": {
Expand Down
6 changes: 3 additions & 3 deletions google-beta/resource_container_cluster_test.go
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5491,7 +5491,7 @@ resource "google_container_cluster" "primary" {
location = "us-central1-a"
initial_node_count = 1
monitoring_config {
enable_components = [ "SYSTEM_COMPONENTS" ]
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER" ]
}
}
`, name)
Expand All @@ -5504,7 +5504,7 @@ resource "google_container_cluster" "primary" {
location = "us-central1-a"
initial_node_count = 1
monitoring_config {
enable_components = [ "SYSTEM_COMPONENTS", "WORKLOADS" ]
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "WORKLOADS" ]
}
}
`, name)
Expand All @@ -5517,7 +5517,7 @@ resource "google_container_cluster" "primary" {
location = "us-central1-a"
initial_node_count = 1
monitoring_config {
enable_components = [ "SYSTEM_COMPONENTS", "WORKLOADS" ]
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "WORKLOADS" ]
managed_prometheus {
enabled = true
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/container_cluster.html.markdown
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ as "Intel Haswell" or "Intel Sandy Bridge".

<a name="nested_monitoring_config"></a>The `monitoring_config` block supports:

* `enable_components` - (Optional) The GKE components exposing metrics. `SYSTEM_COMPONENTS` and in beta provider, both `SYSTEM_COMPONENTS` and `WORKLOADS` are supported. (`WORKLOADS` is deprecated and removed in GKE 1.24.)
* `enable_components` - (Optional) The GKE components exposing metrics. Supported values include: `SYSTEM_COMPONENTS`, `APISERVER`, `CONTROLLER_MANAGER`, and `SCHEDULER`. In beta provider, `WORKLOADS` is supported on top of those 4 values. (`WORKLOADS` is deprecated and removed in GKE 1.24.)

* `managed_prometheus` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) Configuration for Managed Service for Prometheus. Structure is [documented below](#nested_managed_prometheus).

Expand Down