From 118300a876c8729703bbed82b12499ddb085195b Mon Sep 17 00:00:00 2001 From: Christian van der Leeden Date: Sat, 14 Dec 2019 19:35:32 +0100 Subject: [PATCH] setting google provider to at least 3.0.0 --- tests/integration/update_cluster/ha_gce/kubernetes.tf | 1 + upup/pkg/fi/cloudup/terraform/target.go | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/integration/update_cluster/ha_gce/kubernetes.tf b/tests/integration/update_cluster/ha_gce/kubernetes.tf index 0dde8c77a69dc..eb9525e356681 100644 --- a/tests/integration/update_cluster/ha_gce/kubernetes.tf +++ b/tests/integration/update_cluster/ha_gce/kubernetes.tf @@ -19,6 +19,7 @@ output "region" { provider "google" { project = "us-test1" region = "us-test1" + version = ">= 3.0.0" } resource "google_compute_disk" "d1-etcd-events-ha-gce-example-com" { diff --git a/upup/pkg/fi/cloudup/terraform/target.go b/upup/pkg/fi/cloudup/terraform/target.go index f93b166066539..91dc64dd7dd2f 100644 --- a/upup/pkg/fi/cloudup/terraform/target.go +++ b/upup/pkg/fi/cloudup/terraform/target.go @@ -197,6 +197,7 @@ func (t *TerraformTarget) Finish(taskMap map[string]fi.Task) error { providerGoogle[k] = v } providersByName["google"] = providerGoogle + providerGoogle["version"] = ">= 3.0.0" } else if t.Cloud.ProviderID() == kops.CloudProviderAWS { providerAWS := make(map[string]interface{}) providerAWS["region"] = t.Region