Merge branch 'master' into gl/fixed_shared_vpc

terraform-google-modules · Mar 7, 2019 · 1213fd3 · 1213fd3
2 parents 6354666 + 58818a7
commit 1213fd3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -137,8 +137,8 @@ The roles granted are specifically:
 ### Terraform plugins
 
 -   [Terraform](https://www.terraform.io/downloads.html) 0.10.x
--   [terraform-provider-google] plugin 1.19.x
--   [terraform-provider-google-beta] plugin 1.19.x
+-   [terraform-provider-google] plugin 2.1.x
+-   [terraform-provider-google-beta] plugin 2.1.x
 -   [terraform-provider-gsuite] plugin 0.1.x if GSuite functionality is desired
 
 ### Permissions

diff --git a/examples/gke_shared_vpc/main.tf b/examples/gke_shared_vpc/main.tf
@@ -20,12 +20,12 @@ locals {
 
 provider "google" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 provider "google-beta" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 module "project-factory" {

diff --git a/examples/group_project/main.tf b/examples/group_project/main.tf
@@ -23,12 +23,12 @@ locals {
  *****************************************/
 provider "google" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 provider "google-beta" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 provider "gsuite" {

diff --git a/examples/project-hierarchy/main.tf b/examples/project-hierarchy/main.tf
@@ -23,12 +23,12 @@ locals {
  *****************************************/
 provider "google" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 provider "google-beta" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 provider "gsuite" {

diff --git a/examples/simple_project/main.tf b/examples/simple_project/main.tf
@@ -23,12 +23,12 @@ locals {
  *****************************************/
 provider "google" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 provider "google-beta" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 module "project-factory" {

diff --git a/modules/project_services/examples/project_services/main.tf b/modules/project_services/examples/project_services/main.tf
@@ -23,12 +23,12 @@ locals {
  *****************************************/
 provider "google" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 provider "google-beta" {
   credentials = "${file(local.credentials_file_path)}"
-  version     = "~> 1.19"
+  version     = "~> 2.1"
 }
 
 module "project-services" {