fix(lb): apply node filtering on all updates

nox-404 · nox-404 · commit 492ef411fc6d · 2023-12-20T10:50:55.000+01:00
diff --git a/scaleway/loadbalancers.go b/scaleway/loadbalancers.go
@@ -333,8 +333,6 @@ func (l *loadbalancers) EnsureLoadBalancer(ctx context.Context, clusterName stri
 		return nil, LoadBalancerNotReady
 	}
 
-	nodes = filterNodes(service, nodes)
-
 	err = l.updateLoadBalancer(ctx, lb, service, nodes)
 	if err != nil {
 		klog.Errorf("error updating loadbalancer for service %s/%s: %v", service.Namespace, service.Name, err)
@@ -614,6 +612,7 @@ func (l *loadbalancers) unannotateAndPatch(service *v1.Service) error {
 }
 
 func (l *loadbalancers) updateLoadBalancer(ctx context.Context, loadbalancer *scwlb.LB, service *v1.Service, nodes []*v1.Node) error {
+	nodes = filterNodes(service, nodes)
 	if l.pnID != "" {
 		respPN, err := l.api.ListLBPrivateNetworks(&scwlb.ZonedAPIListLBPrivateNetworksRequest{
 			Zone: loadbalancer.Zone,

Original file line number	Diff line number	Diff line change
`@@ -333,8 +333,6 @@ func (l *loadbalancers) EnsureLoadBalancer(ctx context.Context, clusterName stri`
`333`	`333`	`return nil, LoadBalancerNotReady`
`334`	`334`	`}`
`335`	`335`
`336`		`- nodes = filterNodes(service, nodes)`
`337`		`-`
`338`	`336`	`err = l.updateLoadBalancer(ctx, lb, service, nodes)`
`339`	`337`	`if err != nil {`
`340`	`338`	`klog.Errorf("error updating loadbalancer for service %s/%s: %v", service.Namespace, service.Name, err)`
`@@ -614,6 +612,7 @@ func (l loadbalancers) unannotateAndPatch(service v1.Service) error {`
`614`	`612`	`}`
`615`	`613`
`616`	`614`	`func (l loadbalancers) updateLoadBalancer(ctx context.Context, loadbalancer scwlb.LB, service v1.Service, nodes []v1.Node) error {`
	`615`	`+ nodes = filterNodes(service, nodes)`
`617`	`616`	`if l.pnID != "" {`
`618`	`617`	`respPN, err := l.api.ListLBPrivateNetworks(&scwlb.ZonedAPIListLBPrivateNetworksRequest{`
`619`	`618`	`Zone: loadbalancer.Zone,`