Remove redundant timeout block, bump provider versions for 0.12

gruntwork-io · May 23, 2019 · 0e0a1ec · 0e0a1ec
1 parent 1872722
commit 0e0a1ec
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/examples/gke-basic-tiller/main.tf b/examples/gke-basic-tiller/main.tf
@@ -15,7 +15,7 @@ terraform {
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   project = "${var.project}"
   region  = "${var.region}"
 
@@ -33,7 +33,7 @@ provider "google" {
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   project = "${var.project}"
   region  = "${var.region}"
 
@@ -57,7 +57,7 @@ data "google_client_config" "client" {}
 data "google_client_openid_userinfo" "terraform_user" {}
 
 provider "kubernetes" {
-  version = "~> 1.5.2"
+  version = "~> 1.7.0"
 
   load_config_file       = false
   host                   = "${data.template_file.gke_host_endpoint.rendered}"

diff --git a/examples/gke-private-cluster/main.tf b/examples/gke-private-cluster/main.tf
@@ -14,13 +14,13 @@ terraform {
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   project = "${var.project}"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   project = "${var.project}"
   region  = "${var.region}"
 }

diff --git a/examples/gke-public-cluster/main.tf b/examples/gke-public-cluster/main.tf
@@ -15,13 +15,13 @@ terraform {
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   project = "${var.project}"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   project = "${var.project}"
   region  = "${var.region}"
 }

diff --git a/main.tf b/main.tf
@@ -14,7 +14,7 @@ terraform {
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   project = "${var.project}"
   region  = "${var.region}"
 
@@ -32,7 +32,7 @@ provider "google" {
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   project = "${var.project}"
   region  = "${var.region}"
 
@@ -56,7 +56,7 @@ data "google_client_config" "client" {}
 data "google_client_openid_userinfo" "terraform_user" {}
 
 provider "kubernetes" {
-  version = "~> 1.5.2"
+  version = "~> 1.7.0"
 
   load_config_file       = false
   host                   = "${data.template_file.gke_host_endpoint.rendered}"

diff --git a/modules/gke-cluster/main.tf b/modules/gke-cluster/main.tf
@@ -87,13 +87,6 @@ resource "google_container_cluster" "cluster" {
       start_time = "${var.maintenance_start_time}"
     }
   }
-
-  # Version 2.0.0 will set the default timeouts to these values.
-  timeouts {
-    create = "30m"
-    update = "30m"
-    delete = "30m"
-  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------