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

Add supported values of APISERVER, CONTROLLER_MANAGER, and SCHEDULER to logging_config #12978

Merged
merged 1 commit into from Nov 8, 2022
Merged

Add supported values of APISERVER, CONTROLLER_MANAGER, and SCHEDULER to logging_config #12978

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/6772.txt
View file
Open in desktop
@@ -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/resource_container_cluster.go
View file
Open in desktop
Expand Up @@ -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),
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion google/resource_container_cluster_test.go
View file
Open in desktop
Expand Up @@ -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" ]
Expand Down
8 changes: 4 additions & 4 deletions website/docs/r/container_cluster.html.markdown
View file
Open in desktop
Expand Up @@ -552,7 +552,7 @@ as "Intel Haswell" or "Intel Sandy Bridge".
<a name="nested_logging_config"></a>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`.

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

Expand Down Expand Up @@ -883,11 +883,11 @@ linux_node_config {

<a name="nested_gpu_sharing_config"></a>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.

<a name="nested_workload_identity_config"></a> The `workload_identity_config` block supports:

Expand Down