From 6baa722325cc1118363a04526188b0387a1f401e Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 8 Nov 2022 08:09:49 -0800 Subject: [PATCH] Add supported values of APISERVER, CONTROLLER_MANAGER, and SCHEDULER to logging_config (#6772) (#12978) * Add supported values of APISERVER, CONTROLLER_MANAGER, and SCHEDULER to logging_config * Add supported values of APISERVER, CONTROLLER_MANAGER, and SCHEDULER to logging_config Signed-off-by: Modular Magician Signed-off-by: Modular Magician --- .changelog/6772.txt | 3 +++ google/resource_container_cluster.go | 4 ++-- google/resource_container_cluster_test.go | 2 +- website/docs/r/container_cluster.html.markdown | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 .changelog/6772.txt diff --git a/.changelog/6772.txt b/.changelog/6772.txt new file mode 100644 index 00000000000..ca64531a42f --- /dev/null +++ b/.changelog/6772.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 index 60c53a20b3f..d7f54629f25 100644 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -649,10 +649,10 @@ func resourceContainerCluster() *schema.Resource { "enable_components": { Type: schema.TypeList, Required: true, - Description: `GKE components exposing logs. Valid values include SYSTEM_COMPONENTS and WORKLOADS.`, + Description: `GKE components exposing logs. 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), }, }, }, diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go index 098d646abcd..f0ae1669b35 100644 --- a/google/resource_container_cluster_test.go +++ b/google/resource_container_cluster_test.go @@ -5324,7 +5324,7 @@ resource "google_container_cluster" "primary" { location = "us-central1-a" initial_node_count = 1 logging_config { - enable_components = [ "SYSTEM_COMPONENTS", "WORKLOADS" ] + enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "WORKLOADS" ] } monitoring_config { enable_components = [ "SYSTEM_COMPONENTS" ] diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index e4aa23ea865..269c93e1940 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -552,7 +552,7 @@ as "Intel Haswell" or "Intel Sandy Bridge". The `logging_config` block supports: * `enable_components` - (Required) The GKE components exposing logs. Supported values include: -`SYSTEM_COMPONENTS` and `WORKLOADS`. +`SYSTEM_COMPONENTS`, `APISERVER`, `CONTROLLER_MANAGER`, `SCHEDULER`, and `WORKLOADS`. The `monitoring_config` block supports: @@ -883,11 +883,11 @@ linux_node_config { The `gpu_sharing_config` block supports: -* `gpu_sharing_strategy` (Required) - The type of GPU sharing strategy to enable on the GPU node. +* `gpu_sharing_strategy` (Required) - The type of GPU sharing strategy to enable on the GPU node. Accepted values are: - * `"TIME_SHARING"`: Allow multiple containers to have [time-shared](https://cloud.google.com/kubernetes-engine/docs/concepts/timesharing-gpus) access to a single GPU device. + * `"TIME_SHARING"`: Allow multiple containers to have [time-shared](https://cloud.google.com/kubernetes-engine/docs/concepts/timesharing-gpus) access to a single GPU device. -* `max_shared_clients_per_gpu` (Required) - The maximum number of containers that can share a GPU. +* `max_shared_clients_per_gpu` (Required) - The maximum number of containers that can share a GPU. The `workload_identity_config` block supports: