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

Remove Subnets fields from cloudformation and terraform

This commit is contained in:
Alexander Block 2021-02-10 15:31:44 +01:00
parent 4ae47cc546
commit 16c89e11b1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
upup/pkg/fi/cloudup/awstasks/network_load_balancer.go
View File

@ -709,8 +709,7 @@ type terraformNetworkLoadBalancer struct {
Name string `json:"name" cty:"name"` Name string `json:"name" cty:"name"`
Internal bool `json:"internal" cty:"internal"` Internal bool `json:"internal" cty:"internal"`
Type string `json:"load_balancer_type" cty:"load_balancer_type"` Type string `json:"load_balancer_type" cty:"load_balancer_type"`
Subnets []*terraform.Literal `json:"subnets,omitempty" cty:"subnets"` SubnetMappings []terraformNetworkLoadBalancerSubnetMapping `json:"subnet_mapping" cty:"subnet_mapping"`
SubnetMappings []terraformNetworkLoadBalancerSubnetMapping `json:"subnet_mapping,omitempty" cty:"subnet_mapping"`
CrossZoneLoadBalancing bool `json:"enable_cross_zone_load_balancing" cty:"enable_cross_zone_load_balancing"` CrossZoneLoadBalancing bool `json:"enable_cross_zone_load_balancing" cty:"enable_cross_zone_load_balancing"`
Tags map[string]string `json:"tags" cty:"tags"` Tags map[string]string `json:"tags" cty:"tags"`
@ -742,7 +741,6 @@ func (_ *NetworkLoadBalancer) RenderTerraform(t *terraform.TerraformTarget, a, e
Internal: fi.StringValue(e.Scheme) == elbv2.LoadBalancerSchemeEnumInternal, Internal: fi.StringValue(e.Scheme) == elbv2.LoadBalancerSchemeEnumInternal,
Type: elbv2.LoadBalancerTypeEnumNetwork, Type: elbv2.LoadBalancerTypeEnumNetwork,
Tags: e.Tags, Tags: e.Tags,
Subnets: make([]*terraform.Literal, 0),
CrossZoneLoadBalancing: fi.BoolValue(e.CrossZoneLoadBalancing), CrossZoneLoadBalancing: fi.BoolValue(e.CrossZoneLoadBalancing),
} }
@ -808,8 +806,7 @@ func (e *NetworkLoadBalancer) TerraformLink(params ...string) *terraform.Literal
type cloudformationNetworkLoadBalancer struct { type cloudformationNetworkLoadBalancer struct {
Name string `json:"Name"` Name string `json:"Name"`
Scheme string `json:"Scheme"` Scheme string `json:"Scheme"`
Subnets []*cloudformation.Literal `json:"Subnets,omitempty"` SubnetMappings []*cloudformationSubnetMapping `json:"SubnetMappings"`
SubnetMappings []*cloudformationSubnetMapping `json:"SubnetMappings,omitempty"`
Type string `json:"Type"` Type string `json:"Type"`
Tags []cloudformationTag `json:"Tags"` Tags []cloudformationTag `json:"Tags"`
} }
@ -840,10 +837,9 @@ type cloudformationNetworkLoadBalancerListenerAction struct {
func (_ *NetworkLoadBalancer) RenderCloudformation(t *cloudformation.CloudformationTarget, a, e, changes *NetworkLoadBalancer) error { func (_ *NetworkLoadBalancer) RenderCloudformation(t *cloudformation.CloudformationTarget, a, e, changes *NetworkLoadBalancer) error {
nlbCF := &cloudformationNetworkLoadBalancer{ nlbCF := &cloudformationNetworkLoadBalancer{
Name: *e.LoadBalancerName, Name: *e.LoadBalancerName,
Subnets: make([]*cloudformation.Literal, 0), Type: elbv2.LoadBalancerTypeEnumNetwork,
Type: elbv2.LoadBalancerTypeEnumNetwork, Tags: buildCloudformationTags(e.Tags),
Tags: buildCloudformationTags(e.Tags),
} }
for _, subnetMapping := range e.SubnetMappings { for _, subnetMapping := range e.SubnetMappings {
nlbCF.SubnetMappings = append(nlbCF.SubnetMappings, &cloudformationSubnetMapping{ nlbCF.SubnetMappings = append(nlbCF.SubnetMappings, &cloudformationSubnetMapping{