Merge pull request #11901 from rifelpet/tf-project

Include GCP Project in terraform HCL2 output
kubernetes · Jul 1, 2021 · b8aa684 · b8aa684
2 parents fe8c26f + 13f4305
commit b8aa684
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/tests/integration/update_cluster/ha_gce/kubernetes.tf b/tests/integration/update_cluster/ha_gce/kubernetes.tf
@@ -17,7 +17,8 @@ output "region" {
 }
 
 provider "google" {
-  region = "us-test1"
+  project = "testproject"
+  region  = "us-test1"
 }
 
 resource "aws_s3_bucket_object" "cluster-completed-spec" {

diff --git a/tests/integration/update_cluster/minimal_gce/kubernetes.tf b/tests/integration/update_cluster/minimal_gce/kubernetes.tf
@@ -17,7 +17,8 @@ output "region" {
 }
 
 provider "google" {
-  region = "us-test1"
+  project = "testproject"
+  region  = "us-test1"
 }
 
 resource "aws_s3_bucket_object" "cluster-completed-spec" {

diff --git a/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf
@@ -17,7 +17,8 @@ output "region" {
 }
 
 provider "google" {
-  region = "us-test1"
+  project = "testproject"
+  region  = "us-test1"
 }
 
 resource "aws_s3_bucket_object" "cluster-completed-spec" {

diff --git a/upup/pkg/fi/cloudup/terraform/target_hcl2.go b/upup/pkg/fi/cloudup/terraform/target_hcl2.go
@@ -44,6 +44,9 @@ func (t *TerraformTarget) finishHCL2() error {
 	}
 	providerBlock := rootBody.AppendNewBlock("provider", []string{providerName})
 	providerBody := providerBlock.Body()
+	if t.Cloud.ProviderID() == kops.CloudProviderGCE {
+		providerBody.SetAttributeValue("project", cty.StringVal(t.Project))
+	}
 	providerBody.SetAttributeValue("region", cty.StringVal(t.Cloud.Region()))
 	for k, v := range tfGetProviderExtraConfig(t.clusterSpecTarget) {
 		providerBody.SetAttributeValue(k, cty.StringVal(v))