From 2bc2afd58b18729ce9a82f50be32e15985b39122 Mon Sep 17 00:00:00 2001 From: Daniel Seymour Date: Wed, 20 Mar 2019 15:35:26 -0700 Subject: [PATCH] Update the test suites to use the google and google-beta 2.2 provider --- autogen/cluster_regional.tf | 2 +- autogen/cluster_zonal.tf | 2 +- cluster_regional.tf | 2 +- cluster_zonal.tf | 2 +- examples/deploy_service/main.tf | 3 ++- examples/node_pool/main.tf | 3 ++- examples/shared_vpc/main.tf | 3 ++- examples/simple_regional/main.tf | 2 ++ examples/simple_regional_private/main.tf | 2 +- examples/simple_zonal/main.tf | 3 ++- examples/simple_zonal_private/main.tf | 2 +- examples/stub_domains/main.tf | 3 ++- 12 files changed, 18 insertions(+), 11 deletions(-) diff --git a/autogen/cluster_regional.tf b/autogen/cluster_regional.tf index 9cbad9ecb1..8c19f503ba 100644 --- 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 index 1c2b7096a9..f73dfd5f94 100644 --- 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 index 69d6ede11d..b6ef957c85 100644 --- 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 index f038ca643a..995c24e289 100644 --- 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 index aea7dea29b..6e2a3d2d5c 100644 --- 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 index cc901d5403..1e1a874ce5 100644 --- 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 index 5d177d2c1c..d4a4283a6f 100644 --- 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 index 864e70b32e..328658cff8 100644 --- 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 index 56e9ad598b..1f1776c8a6 100644 --- 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 index d08c0da413..71fe57ed28 100644 --- 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 index 351370c3c8..76f7d6da13 100644 --- 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 index e95e2f10d2..1a5568e663 100644 --- 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}" }