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

Include GCP Project in terraform HCL2 output 

This has been included in the JSON output but was missing from HCL2
This commit is contained in:
Peter Rifel 2021-07-01 08:15:52 -04:00
parent 159943eb8e
commit 3c1cc72d51
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
3 changed files with 7 additions and 2 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

@ -17,6 +17,7 @@ output "region" {
} }
provider "google" { provider "google" {
project = "us-test1"
region = "us-test1" region = "us-test1"
} }

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

@ -17,6 +17,7 @@ output "region" {
} }
provider "google" { provider "google" {
project = "us-test1"
region = "us-test1" region = "us-test1"
} }

3
upup/pkg/fi/cloudup/terraform/target_hcl2.go
View File

@ -42,6 +42,9 @@ func (t *TerraformTarget) finishHCL2(taskMap map[string]fi.Task) error {
} }
providerBlock := rootBody.AppendNewBlock("provider", []string{providerName}) providerBlock := rootBody.AppendNewBlock("provider", []string{providerName})
providerBody := providerBlock.Body() providerBody := providerBlock.Body()
if t.Cloud.ProviderID() == kops.CloudProviderGCE {
providerBody.SetAttributeValue("project", cty.StringVal(t.Project))
}
providerBody.SetAttributeValue("region", cty.StringVal(t.Cloud.Region())) providerBody.SetAttributeValue("region", cty.StringVal(t.Cloud.Region()))
for k, v := range tfGetProviderExtraConfig(t.clusterSpecTarget) { for k, v := range tfGetProviderExtraConfig(t.clusterSpecTarget) {
providerBody.SetAttributeValue(k, cty.StringVal(v)) providerBody.SetAttributeValue(k, cty.StringVal(v))