diff --git a/.changelog/6352.txt b/.changelog/6352.txt new file mode 100644 index 00000000000..ca64531a42f --- /dev/null +++ b/.changelog/6352.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +container: added support for additional values `APISERVER`, `CONTROLLER_MANAGER`, and `SCHEDULER` in `google_container_cluster.monitoring_config` +``` diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go old mode 100644 new mode 100755 index 5f6675cc603..edeb41d5186 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -648,10 +648,10 @@ func resourceContainerCluster() *schema.Resource { "enable_components": { Type: schema.TypeList, Required: true, - Description: `GKE components exposing metrics. Valid values include SYSTEM_COMPONENTS.`, + Description: `GKE components exposing metrics. Valid values include SYSTEM_COMPONENTS, APISERVER, CONTROLLER_MANAGER, and SCHEDULER.`, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS"}, false), + ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER"}, false), }, }, }, diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go old mode 100644 new mode 100755 index 410dc38a0a4..8487860f5d1 --- a/google/resource_container_cluster_test.go +++ b/google/resource_container_cluster_test.go @@ -4464,7 +4464,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) diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown old mode 100644 new mode 100755 index 3bec22ec2c1..2fa06423aca --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -507,7 +507,7 @@ as "Intel Haswell" or "Intel Sandy Bridge". 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).