Update docs and fix computed container settings

This commit is contained in:
Evan Brown 2016-04-14 16:30:39 -07:00
parent 5eaf2033bd
commit c6763fd3af
2 changed files with 20 additions and 5 deletions

View File

@ -154,7 +154,6 @@ func resourceContainerCluster() *schema.Resource {
"addons_config": &schema.Schema{
Type: schema.TypeList,
Optional: true,
Computed: true,
ForceNew: true,
MaxItems: 1,
Elem: &schema.Resource{
@ -162,7 +161,6 @@ func resourceContainerCluster() *schema.Resource {
"http_load_balancing": &schema.Schema{
Type: schema.TypeList,
Optional: true,
Computed: true,
ForceNew: true,
MaxItems: 1,
Elem: &schema.Resource{
@ -170,7 +168,6 @@ func resourceContainerCluster() *schema.Resource {
"disabled": &schema.Schema{
Type: schema.TypeBool,
Optional: true,
Computed: true,
ForceNew: true,
},
},
@ -179,7 +176,6 @@ func resourceContainerCluster() *schema.Resource {
"horizontal_pod_autoscaling": &schema.Schema{
Type: schema.TypeList,
Optional: true,
Computed: true,
ForceNew: true,
MaxItems: 1,
Elem: &schema.Resource{
@ -187,7 +183,6 @@ func resourceContainerCluster() *schema.Resource {
"disabled": &schema.Schema{
Type: schema.TypeBool,
Optional: true,
Computed: true,
ForceNew: true,
},
},

View File

@ -50,6 +50,7 @@ resource "google_container_cluster" "primary" {
* `zone` - (Required) The zone that all resources should be created in.
- - -
* `addons_config` - (Optional) The configuration for addons supported by Google Container Engine
* `cluster_ipv4_cidr` - (Optional) The IP address range of the container pods in
this cluster. Default is an automatically assigned CIDR.
@ -78,6 +79,8 @@ resource "google_container_cluster" "primary" {
* `project` - (Optional) The project in which the resource belongs. If it
is not provided, the provider project is used.
* `subnetwork` - (Optional) The name of the Google Compute Engine subnetwork in which the cluster's instances are launched
**Master Auth** supports the following arguments:
* `password` - The password to use for HTTP basic authentication when accessing
@ -103,6 +106,23 @@ resource "google_container_cluster" "primary" {
* `https://www.googleapis.com/auth/logging.write` (if `logging_service` points to Google)
* `https://www.googleapis.com/auth/monitoring` (if `monitoring_service` points to Google)
**Addons Config** supports the following addons:
* `http_load_balancing` - (Optional) The status of the HTTP Load Balancing addon. It is enabled by default; set `disabled = true` to disable.
* `horizontal_pod_autoscaling` - (Optional) The status of the Horizontal Pod Autoscaling addon. It is enabled by default; set `disabled = true` to disable.
This example `addons_config` disables both addons:
```
addons_config {
http_load_balancing {
disabled = false
}
horizontal_pod_autoscaling {
disabled = false
}
}
```
## Attributes Reference
In addition to the arguments listed above, the following computed attributes are