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

Merge pull request #12412 from olemarkus/nlb-add-subnet 

Allow adding more subnets to an NLB
This commit is contained in:
Kubernetes Prow Robot 2021-09-25 17:32:21 -07:00 committed by GitHub
parent ef22270b3f fc9c86e778
commit 93dc3b907c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,7 +460,7 @@ func (e *NetworkLoadBalancer) Normalize() {
sort.Stable(OrderTargetGroupsByName(e.TargetGroups)) 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 a == nil {
if fi.StringValue(e.Name) == "" { if fi.StringValue(e.Name) == "" {
return fi.RequiredField("Name") return fi.RequiredField("Name")
@ -489,12 +489,12 @@ func (s *NetworkLoadBalancer) CheckChanges(a, e, changes *NetworkLoadBalancer) e
if len(changes.SubnetMappings) > 0 { if len(changes.SubnetMappings) > 0 {
expectedSubnets := make(map[string]*string) expectedSubnets := make(map[string]*string)
for _, s := range e.SubnetMappings { for _, s := range e.SubnetMappings {
//expectedSubnets[*s.Subnet.ID] = s
if s.AllocationID != nil { if s.AllocationID != nil {
expectedSubnets[*s.Subnet.ID] = s.AllocationID expectedSubnets[*s.Subnet.ID] = s.AllocationID
} } else if s.PrivateIPv4Address != nil {
if s.PrivateIPv4Address != nil {
expectedSubnets[*s.Subnet.ID] = s.PrivateIPv4Address expectedSubnets[*s.Subnet.ID] = s.PrivateIPv4Address
} else {
expectedSubnets[*s.Subnet.ID] = nil
} }
} }