Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch deprecation notices and add timeouts for cluster #36

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Patch deprecation notices and add timeouts for cluster #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86d7b5d
Patch deprecation notices and add timeouts for cluster
mariusmitrofan Oct 25, 2019
2d4061e
"From time to time" the cluster does not get fully deleted before the…
mariusmitrofan Oct 25, 2019
29cc694
Update terraform google provider to 2.18.0
mariusmitrofan Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/teardown.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
source "$ROOT/scripts/common.sh"

# Tear down Terraform-managed resources and remove generated tfvars
cd "$ROOT/terraform" || exit; terraform destroy -target google_container_cluster.primary -input=false -auto-approve
cd "$ROOT/terraform" || exit; terraform destroy -input=false -auto-approve
rm -f "$ROOT/terraform/terraform.tfvars"
11 changes: 8 additions & 3 deletions terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
// Provides access to available Google Container Engine versions in a zone for a given project.
// https://www.terraform.io/docs/providers/google/d/google_container_engine_versions.html
data "google_container_engine_versions" "on-prem" {
zone = var.zone
project = var.project
location = var.zone
project = var.project
}

// https://www.terraform.io/docs/providers/google/r/google_container_cluster.html
Expand Down Expand Up @@ -84,7 +84,7 @@ module "auditor_instance" {
resource "google_container_cluster" "primary" {
name = var.cluster_name
project = var.project
zone = var.zone
location = var.zone
network = module.network.network_self_link
subnetwork = module.network.subnet_self_link
min_master_version = data.google_container_engine_versions.on-prem.latest_master_version
Expand Down Expand Up @@ -162,5 +162,10 @@ resource "google_container_cluster" "primary" {
disabled = false
}
}
timeouts {
create = "60m"
update = "60m"
delete = "60m"
}
}

2 changes: 1 addition & 1 deletion terraform/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
provider "google" {
project = var.project
zone = var.zone
version = "~> 2.17.0"
version = "~> 2.18.0"
}

// Pins the version of the "random" provider
Expand Down