CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dalton Hubble 2019-07-05 19:48:49 -07:00
parent 3fcb04f68c
commit 7a69bae75e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -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)) * 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)) * 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 #### Addons

4
google-cloud/container-linux/kubernetes/network.tf
View File

@ -2,6 +2,10 @@ resource "google_compute_network" "network" {
name = var.cluster_name name = var.cluster_name
description = "Network for the ${var.cluster_name} cluster" description = "Network for the ${var.cluster_name} cluster"
auto_create_subnetworks = true auto_create_subnetworks = true
timeouts {
delete = "6m"
}
} }
resource "google_compute_firewall" "allow-ssh" { resource "google_compute_firewall" "allow-ssh" {