Merge pull request terraform-google-modules#106 from thefirstofthe300…

…/ds/google-provider-2.0 Update support of google and google-beta providers to v2.0
WALTER-GROUP · Mar 22, 2019 · ace011a · ace011a
2 parents 479fe5f + 0eb3da1
commit ace011a
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 11 deletions.
diff --git a/autogen/cluster_regional.tf b/autogen/cluster_regional.tf
@@ -98,7 +98,7 @@ resource "google_container_cluster" "primary" {
   Create regional node pools
  *****************************************/
 resource "google_container_node_pool" "pools" {
-  provider           = "{% if private_cluster %}google-beta{%else %}google{% endif %}"
+  provider           = "google-beta"
   count              = "${var.regional ? length(var.node_pools) : 0}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"

diff --git a/autogen/cluster_zonal.tf b/autogen/cluster_zonal.tf
@@ -98,7 +98,7 @@ resource "google_container_cluster" "zonal_primary" {
   Create zonal node pools
  *****************************************/
 resource "google_container_node_pool" "zonal_pools" {
-  provider           = "{% if private_cluster %}google-beta{%else %}google{% endif %}"
+  provider           = "google-beta"
   count              = "${var.regional ? 0 : length(var.node_pools)}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"

diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -91,7 +91,7 @@ resource "google_container_cluster" "primary" {
   Create regional node pools
  *****************************************/
 resource "google_container_node_pool" "pools" {
-  provider           = "google"
+  provider           = "google-beta"
   count              = "${var.regional ? length(var.node_pools) : 0}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"

diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -91,7 +91,7 @@ resource "google_container_cluster" "zonal_primary" {
   Create zonal node pools
  *****************************************/
 resource "google_container_node_pool" "zonal_pools" {
-  provider           = "google"
+  provider           = "google-beta"
   count              = "${var.regional ? 0 : length(var.node_pools)}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"

diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
-  version     = "~> 1.20"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   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,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -19,11 +19,13 @@ locals {
 }
 
 provider "google" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   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     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   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     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }