kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8108 from mccare/terraform-google-provider-version 

Terraform GCE output: setting google provider to at least 3.0.0
This commit is contained in:
Kubernetes Prow Robot 2019-12-15 08:29:36 -08:00 committed by GitHub
parent 412c1c498c 118300a876
commit 3a7089fe4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/integration/update_cluster/ha_gce/kubernetes.tf
View File

@ -19,6 +19,7 @@ output "region" {
provider "google" { provider "google" {
project = "us-test1" project = "us-test1"
region = "us-test1" region = "us-test1"
version = ">= 3.0.0"
} }
resource "google_compute_disk" "d1-etcd-events-ha-gce-example-com" { resource "google_compute_disk" "d1-etcd-events-ha-gce-example-com" {

1
upup/pkg/fi/cloudup/terraform/target.go
View File

@ -197,6 +197,7 @@ func (t *TerraformTarget) Finish(taskMap map[string]fi.Task) error {
providerGoogle[k] = v providerGoogle[k] = v
} }
providersByName["google"] = providerGoogle providersByName["google"] = providerGoogle
providerGoogle["version"] = ">= 3.0.0"
} else if t.Cloud.ProviderID() == kops.CloudProviderAWS { } else if t.Cloud.ProviderID() == kops.CloudProviderAWS {
providerAWS := make(map[string]interface{}) providerAWS := make(map[string]interface{})
providerAWS["region"] = t.Region providerAWS["region"] = t.Region