public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

allow beta kubernetes logging; add monitoring validation (#1589)

Browse Source 
Fixes #1577
This commit is contained in:
Dana Hoffman 2018-06-04 15:09:52 -07:00 committed by GitHub
parent b85473619c
commit ac6e30d335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
google/resource_container_cluster.go
View File

@ -219,7 +219,7 @@ func resourceContainerCluster() *schema.Resource {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{"logging.googleapis.com", "none"}, false),
ValidateFunc: validation.StringInSlice([]string{"logging.googleapis.com", "logging.googleapis.com/kubernetes", "none"}, false),
},
"maintenance_policy": {
@ -322,9 +322,10 @@ func resourceContainerCluster() *schema.Resource {
},
"monitoring_service": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{"monitoring.googleapis.com", "monitoring.googleapis.com/kubernetes", "none"}, false),
},
"network": {

8
website/docs/r/container_cluster.html.markdown
View File

@ -109,8 +109,8 @@ output "cluster_ca_certificate" {
Structure is documented below.
* `logging_service` - (Optional) The logging service that the cluster should
write logs to. Available options include `logging.googleapis.com` and
`none`. Defaults to `logging.googleapis.com`
write logs to. Available options include `logging.googleapis.com`,
`logging.googleapis.com/kubernetes` (beta), and `none`. Defaults to `logging.googleapis.com`
* `maintenance_policy` - (Optional) The maintenance policy to use for the cluster. Structure is
documented below.
@ -137,8 +137,8 @@ output "cluster_ca_certificate" {
Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API.
VM metrics will be collected by Google Compute Engine regardless of this setting
Available options include
`monitoring.googleapis.com` and `none`. Defaults to
`monitoring.googleapis.com`
`monitoring.googleapis.com`, `monitoring.googleapis.com/kubernetes` (beta) and `none`.
Defaults to `monitoring.googleapis.com`
* `network` - (Optional) The name or self_link of the Google Compute Engine
network to which the cluster is connected. For Shared VPC, set this to the self link of the