mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-07-09 03:28:29 +00:00
allow beta kubernetes logging; add monitoring validation (#1589)
Fixes #1577
This commit is contained in:
parent
b85473619c
commit
ac6e30d335
|
@ -219,7 +219,7 @@ func resourceContainerCluster() *schema.Resource {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
Computed: 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": {
|
"maintenance_policy": {
|
||||||
|
@ -325,6 +325,7 @@ func resourceContainerCluster() *schema.Resource {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
|
ValidateFunc: validation.StringInSlice([]string{"monitoring.googleapis.com", "monitoring.googleapis.com/kubernetes", "none"}, false),
|
||||||
},
|
},
|
||||||
|
|
||||||
"network": {
|
"network": {
|
||||||
|
|
|
@ -109,8 +109,8 @@ output "cluster_ca_certificate" {
|
||||||
Structure is documented below.
|
Structure is documented below.
|
||||||
|
|
||||||
* `logging_service` - (Optional) The logging service that the cluster should
|
* `logging_service` - (Optional) The logging service that the cluster should
|
||||||
write logs to. Available options include `logging.googleapis.com` and
|
write logs to. Available options include `logging.googleapis.com`,
|
||||||
`none`. Defaults to `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
|
* `maintenance_policy` - (Optional) The maintenance policy to use for the cluster. Structure is
|
||||||
documented below.
|
documented below.
|
||||||
|
@ -137,8 +137,8 @@ output "cluster_ca_certificate" {
|
||||||
Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API.
|
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
|
VM metrics will be collected by Google Compute Engine regardless of this setting
|
||||||
Available options include
|
Available options include
|
||||||
`monitoring.googleapis.com` and `none`. Defaults to
|
`monitoring.googleapis.com`, `monitoring.googleapis.com/kubernetes` (beta) and `none`.
|
||||||
`monitoring.googleapis.com`
|
Defaults to `monitoring.googleapis.com`
|
||||||
|
|
||||||
* `network` - (Optional) The name or self_link of the Google Compute Engine
|
* `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
|
network to which the cluster is connected. For Shared VPC, set this to the self link of the
|
||||||
|
|
Loading…
Reference in New Issue
Block a user