From fc9c86e778a17304b9900c5f436e3edb3ae03d76 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Fri, 24 Sep 2021 14:21:45 +0200 Subject: [PATCH] Allow adding more subnets to an NLB --- upup/pkg/fi/cloudup/awstasks/network_load_balancer.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/upup/pkg/fi/cloudup/awstasks/network_load_balancer.go b/upup/pkg/fi/cloudup/awstasks/network_load_balancer.go index 5058a225f1..d31baebe3f 100644 --- a/upup/pkg/fi/cloudup/awstasks/network_load_balancer.go +++ b/upup/pkg/fi/cloudup/awstasks/network_load_balancer.go @@ -460,7 +460,7 @@ func (e *NetworkLoadBalancer) Normalize() { sort.Stable(OrderTargetGroupsByName(e.TargetGroups)) } -func (s *NetworkLoadBalancer) CheckChanges(a, e, changes *NetworkLoadBalancer) error { +func (*NetworkLoadBalancer) CheckChanges(a, e, changes *NetworkLoadBalancer) error { if a == nil { if fi.StringValue(e.Name) == "" { return fi.RequiredField("Name") @@ -489,12 +489,12 @@ func (s *NetworkLoadBalancer) CheckChanges(a, e, changes *NetworkLoadBalancer) e if len(changes.SubnetMappings) > 0 { expectedSubnets := make(map[string]*string) for _, s := range e.SubnetMappings { - //expectedSubnets[*s.Subnet.ID] = s if s.AllocationID != nil { expectedSubnets[*s.Subnet.ID] = s.AllocationID - } - if s.PrivateIPv4Address != nil { + } else if s.PrivateIPv4Address != nil { expectedSubnets[*s.Subnet.ID] = s.PrivateIPv4Address + } else { + expectedSubnets[*s.Subnet.ID] = nil } }