Merge pull request #155 from terraform-google-modules/aaron-lane-provider-update

morgante · web-flow · commit 2ec203792ef5 · 2019-05-28T11:10:57.000-04:00
Add support for v2.6, v2.7 of Google providers
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ Extending the adopted spec, each change should have a link to its corresponding
 
 ## [Unreleased]
 
+### Added
+
+* Support for v2.6 and v2.7 of the Google providers. [#152]
+
 ### Fixed
 
 * The dependency on jq has been documented in the README. [#151]
@@ -115,6 +119,7 @@ Extending the adopted spec, each change should have a link to its corresponding
 [v0.3.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.2.0...v0.3.0
 [v0.2.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.1.0...v0.2.0
 
+[#152]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/152
 [#151]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/151
 [#148]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/148
 [#132]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/132
diff --git a/README.md b/README.md
@@ -190,13 +190,11 @@ Before this module can be used on a project, you must ensure that the following
 The [project factory](https://github.com/terraform-google-modules/terraform-google-project-factory) can be used to provision projects with the correct APIs active and the necessary Shared VPC connections.
 
 ### Software Dependencies
-#### CLI tools
+#### Kubectl
 - [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
-- [jq](https://stedolan.github.io/jq/) 1.6.x
-
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.11.x
-- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3
+- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3, v2.6, v2.7
 
 ### Configure a Service Account
 In order to execute this module you must have a Service Account with the
diff --git a/autogen/README.md b/autogen/README.md
@@ -138,9 +138,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.11.x
 {% if private_cluster %}
-- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3
+- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.7
 {% else %}
-- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3
+- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3, v2.6, v2.7
 {% endif %}
 
 ### Configure a Service Account
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -19,12 +19,12 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 2.3.0"
+  version     = "~> 2.7.0"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,12 +19,12 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -19,12 +19,12 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -19,12 +19,12 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf
@@ -19,12 +19,12 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -19,12 +19,12 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.3.0"
+  version = "~> 2.7.0"
   region  = "${var.region}"
 }
 
diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -202,7 +202,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 - [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.11.x
-- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3
+- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.7
 
 ### Configure a Service Account
 In order to execute this module you must have a Service Account with the

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google" {`
`22`		`- version = "~> 2.3.0"`
	`22`	`+ version = "~> 2.7.0"`
`23`	`23`	`region = "${var.region}"`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`provider "google-beta" {`
`27`		`- version = "~> 2.3.0"`
	`27`	`+ version = "~> 2.7.0"`
`28`	`28`	`region = "${var.region}"`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google" {`
`22`		`- version = "~> 2.3.0"`
	`22`	`+ version = "~> 2.7.0"`
`23`	`23`	`credentials = "${file(var.credentials_path)}"`
`24`	`24`	`region = "${var.region}"`
`25`	`25`	`}`