From 7a69bae75e4c530d1222f330f3f6ec9039e123ce Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Fri, 5 Jul 2019 19:48:49 -0700
Subject: [PATCH] Raise GCP network deletion timeout from 4m to 6m

* Fix a GCP errata item https://github.com/poseidon/typhoon/wiki/Errata
* Removal of a Google Cloud cluster often required 2 runs of
`terraform apply` because network resource deletes timeout
after 4m. Raise the network deletion timeout to 6m to
ensure apply only needs to be run once to remove a cluster
---
 CHANGES.md                                         | 1 +
 google-cloud/container-linux/kubernetes/network.tf | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 5d1e7f925..8c58a0d7e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Notable changes between versions.
 
 * Allow controller nodes to span more than 3 zones if available in a region ([#504](https://github.com/poseidon/typhoon/pull/504))
 * Eliminate extraneous controller instance groups in single-controller clusters ([#504](https://github.com/poseidon/typhoon/pull/504))
+* Raise network deletion timeout from 4m to 6m ([#505](https://github.com/poseidon/typhoon/pull/505))
 
 #### Addons
 
diff --git a/google-cloud/container-linux/kubernetes/network.tf b/google-cloud/container-linux/kubernetes/network.tf
index 4f9d78a84..a0f3fad80 100644
--- a/google-cloud/container-linux/kubernetes/network.tf
+++ b/google-cloud/container-linux/kubernetes/network.tf
@@ -2,6 +2,10 @@ resource "google_compute_network" "network" {
   name                    = var.cluster_name
   description             = "Network for the ${var.cluster_name} cluster"
   auto_create_subnetworks = true
+
+  timeouts {
+    delete = "6m"
+  }
 }
 
 resource "google_compute_firewall" "allow-ssh" {