From 1573b0a64baa7b74c7f10d2644964f70d3763eee Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Mon, 14 Nov 2016 15:49:43 -0800 Subject: [PATCH 1/2] Clean up google_container_cluster docs --- r/container_cluster.html.markdown | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/r/container_cluster.html.markdown b/r/container_cluster.html.markdown index 0375837e..1a161500 100644 --- a/r/container_cluster.html.markdown +++ b/r/container_cluster.html.markdown @@ -50,7 +50,8 @@ 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 +* `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. @@ -66,8 +67,8 @@ resource "google_container_cluster" "primary" { `monitoring.googleapis.com` 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 +* `network` - (Optional) The name or self_link of the Google Compute Engine + network to which the cluster is connected * `node_config` - (Optional) The machine type and image to use for all nodes in this cluster @@ -79,7 +80,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 +* `subnetwork` - (Optional) The name of the Google Compute Engine subnetwork in +which the cluster's instances are launched **Master Auth** supports the following arguments: @@ -108,14 +110,17 @@ resource "google_container_cluster" "primary" { **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. +* `http_load_balancing` - (Optional) The status of the HTTP Load Balancing + add-on. 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 { + http_load_balancing { disabled = true } horizontal_pod_autoscaling { From 0058a5b37e99828c065b0c4bc591d906d519baed Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Mon, 14 Nov 2016 15:50:24 -0800 Subject: [PATCH 2/2] Add support for scope aliases to google_container_cluster --- r/container_cluster.html.markdown | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/r/container_cluster.html.markdown b/r/container_cluster.html.markdown index 1a161500..c2babe91 100644 --- a/r/container_cluster.html.markdown +++ b/r/container_cluster.html.markdown @@ -100,13 +100,16 @@ which the cluster's instances are launched in GB. The smallest allowed disk size is 10GB. Defaults to 100GB. * `oauth_scopes` - (Optional) The set of Google API scopes to be made available - on all of the node VMs under the "default" service account. The following - scopes are necessary to ensure the correct functioning of the cluster: + on all of the node VMs under the "default" service account. These can be + either FQDNs, or scope aliases. The following scopes are necessary to ensure + the correct functioning of the cluster: - * `https://www.googleapis.com/auth/compute` - * `https://www.googleapis.com/auth/devstorage.read_only` - * `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) + * `compute-rw` (`https://www.googleapis.com/auth/compute`) + * `storage-ro` (`https://www.googleapis.com/auth/devstorage.read_only`) + * `logging-write` (`https://www.googleapis.com/auth/logging.write`), + if `logging_service` points to Google + * `monitoring` (`https://www.googleapis.com/auth/monitoring`), + if `monitoring_service` points to Google **Addons Config** supports the following addons: