[Terraform]: Add timeouts to container node pool docs, add timeouts t…

…o examples. (#1328) Merged PR #1328.
GoogleCloudPlatform · Jan 31, 2019 · c469b7e · c469b7e
1 parent 4b252bc
commit c469b7e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/website/docs/r/container_cluster.html.markdown b/third_party/terraform/website/docs/r/container_cluster.html.markdown
@@ -48,6 +48,11 @@ resource "google_container_cluster" "primary" {
 
     tags = ["foo", "bar"]
   }
+
+  timeouts {
+    create = "30m"
+    update = "40m"
+  }
 }
 
 # The following outputs allow authentication and connectivity to the GKE Cluster.
@@ -484,8 +489,8 @@ exported:
 [Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
 
 - `create` - (Default `30 minutes`) Used for clusters
-- `update` - (Default `10 minutes`) Used for updates to clusters
-- `delete` - (Default `10 minutes`) Used for destroying clusters.
+- `update` - (Default `30 minutes`) Used for updates to clusters
+- `delete` - (Default `30 minutes`) Used for destroying clusters.
 
 ## Import
 

diff --git a/third_party/terraform/website/docs/r/container_node_pool.html.markdown b/third_party/terraform/website/docs/r/container_node_pool.html.markdown
@@ -21,6 +21,11 @@ resource "google_container_node_pool" "np" {
   zone       = "us-central1-a"
   cluster    = "${google_container_cluster.primary.name}"
   node_count = 3
+  
+  timeouts {
+    create = "30m"
+    update = "20m"
+  }
 }
 
 resource "google_container_cluster" "primary" {
@@ -162,6 +167,16 @@ The `management` block supports:
 
 * `auto_upgrade` - (Optional) Whether the nodes will be automatically upgraded.
 
+<a id="timeouts"></a>
+## Timeouts
+
+`google_container_node_pool` provides the following
+[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
+
+- `create` - (Default `30 minutes`) Used for adding node pools
+- `update` - (Default `10 minutes`) Used for updates to node pools
+- `delete` - (Default `10 minutes`) Used for removing node pools.
+
 ## Import
 
 Node pools can be imported using the `project`, `zone`, `cluster` and `name`. If