diff --git a/.changelog/6877.txt b/.changelog/6877.txt new file mode 100644 index 0000000000..30db9cfad6 --- /dev/null +++ b/.changelog/6877.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +container: promoted `managed_prometheus` field in google_container_cluster` to GA +``` diff --git a/google-beta/resource_container_cluster_test.go b/google-beta/resource_container_cluster_test.go index 619438d832..a2a4888d6b 100644 --- a/google-beta/resource_container_cluster_test.go +++ b/google-beta/resource_container_cluster_test.go @@ -6821,7 +6821,7 @@ resource "google_container_cluster" "primary" { location = "us-central1-a" initial_node_count = 1 logging_config { - enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "WORKLOADS" ] + enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER"] } monitoring_config { enable_components = [ "SYSTEM_COMPONENTS" ] @@ -6890,7 +6890,7 @@ resource "google_container_cluster" "primary" { initial_node_count = 1 min_master_version = "1.23.8-gke.1900" monitoring_config { - enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "WORKLOADS" ] + enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER" ] managed_prometheus { enabled = true } @@ -6907,8 +6907,9 @@ resource "google_container_cluster" "primary" { initial_node_count = 1 min_master_version = "1.23.8-gke.1900" monitoring_config { + enable_components = [] managed_prometheus { - enabled = true + enabled = true } } } diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index 7332fbd5f2..1cc428c3dd 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -540,7 +540,7 @@ This block also contains several computed attributes, documented below. * `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). +* `managed_prometheus` - (Optional) Configuration for Managed Service for Prometheus. Structure is [documented below](#nested_managed_prometheus). The `managed_prometheus` block supports: