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

Merge pull request #11901 from rifelpet/tf-project 

Include GCP Project in terraform HCL2 output
This commit is contained in:
Kubernetes Prow Robot 2021-07-01 07:05:55 -07:00 committed by GitHub
parent fe8c26fa15 13f4305b9c
commit b8aa684bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,8 @@ output "region" {
} }
provider "google" { provider "google" {
region = "us-test1" project = "testproject"
region = "us-test1"
} }
resource "aws_s3_bucket_object" "cluster-completed-spec" { resource "aws_s3_bucket_object" "cluster-completed-spec" {

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

@ -17,7 +17,8 @@ output "region" {
} }
provider "google" { provider "google" {
region = "us-test1" project = "testproject"
region = "us-test1"
} }
resource "aws_s3_bucket_object" "cluster-completed-spec" { resource "aws_s3_bucket_object" "cluster-completed-spec" {

3
tests/integration/update_cluster/minimal_gce_private/kubernetes.tf
View File

@ -17,7 +17,8 @@ output "region" {
} }
provider "google" { provider "google" {
region = "us-test1" project = "testproject"
region = "us-test1"
} }
resource "aws_s3_bucket_object" "cluster-completed-spec" { resource "aws_s3_bucket_object" "cluster-completed-spec" {

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

@ -44,6 +44,9 @@ func (t *TerraformTarget) finishHCL2() 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))