Fixing the nodebalancer config rebuilds to include ids of preexisting nodebalancer nodes

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ 'stable', 'oldstable', '1.20' ]
+        go-version: [ 'stable', 'oldstable', '1.21' ]
     steps:
       - uses: actions/checkout@v4
         with:

cloud/linode/client/client.go

@@ -21,6 +21,7 @@ type Client interface {
 	UpdateNodeBalancer(context.Context, int, linodego.NodeBalancerUpdateOptions) (*linodego.NodeBalancer, error)
 	DeleteNodeBalancer(context.Context, int) error
 	ListNodeBalancers(context.Context, *linodego.ListOptions) ([]linodego.NodeBalancer, error)
+	ListNodeBalancerNodes(context.Context, int, int, *linodego.ListOptions) ([]linodego.NodeBalancerNode, error)
 
 	CreateNodeBalancerConfig(context.Context, int, linodego.NodeBalancerConfigCreateOptions) (*linodego.NodeBalancerConfig, error)
 	DeleteNodeBalancerConfig(context.Context, int, int) error

cloud/linode/loadbalancers.go

@@ -296,12 +296,6 @@ func (l *loadbalancers) updateNodeBalancer(
 			return err
 		}
 
-		// Add all of the Nodes to the config
-		var newNBNodes []linodego.NodeBalancerNodeCreateOptions
-		for _, node := range nodes {
-			newNBNodes = append(newNBNodes, l.buildNodeBalancerNodeCreateOptions(node, port.NodePort))
-		}
-
 		// Look for an existing config for this port
 		var currentNBCfg *linodego.NodeBalancerConfig
 		for i := range nbCfgs {
@@ -311,6 +305,33 @@ func (l *loadbalancers) updateNodeBalancer(
 				break
 			}
 		}
+		oldNBNodeIDs := make(map[string]int)
+		if currentNBCfg != nil {
+			// Obtain list of current NB nodes and convert it to map of node IDs
+			currentNBNodes, err := l.client.ListNodeBalancerNodes(ctx, nb.ID, currentNBCfg.ID, nil)
+			if err != nil {
+				klog.Warningf("Unable to list existing nodebalancer nodes for NB %d config %d, error: %s", nb.ID, newNBCfg.ID, err)
+			} else {
+				for _, node := range currentNBNodes {
+					oldNBNodeIDs[node.Address] = node.ID
+				}
+			}
+			klog.Infof("Nodebalancer %d had nodes %v", nb.ID, oldNBNodeIDs)
+		} else {
+			klog.Infof("No preexisting nodebalancer for port %v found.", port.Port)
+		}
+		// Add all of the Nodes to the config
+		newNBNodes := make([]linodego.NodeBalancerConfigRebuildNodeOptions, 0)
+		for _, node := range nodes {
+			newNodeOpts := l.buildNodeBalancerNodeConfigRebuildOptions(node, port.NodePort)
+			oldNodeID, ok := oldNBNodeIDs[newNodeOpts.Address]
+			if ok {
+				newNodeOpts.ID = oldNodeID
+			} else {
+				klog.Infof("No preexisting node id for %v found.", newNodeOpts.Address)
+			}
+			newNBNodes = append(newNBNodes, newNodeOpts)
+		}
 
 		// If there's no existing config, create it
 		var rebuildOpts linodego.NodeBalancerConfigRebuildOptions
@@ -652,7 +673,7 @@ func (l *loadbalancers) buildLoadBalancerRequest(ctx context.Context, clusterNam
 		createOpt := config.GetCreateOptions()
 
 		for _, n := range nodes {
-			createOpt.Nodes = append(createOpt.Nodes, l.buildNodeBalancerNodeCreateOptions(n, port.NodePort))
+			createOpt.Nodes = append(createOpt.Nodes, l.buildNodeBalancerNodeConfigRebuildOptions(n, port.NodePort).NodeBalancerNodeCreateOptions)
 		}
 
 		configs = append(configs, &createOpt)
@@ -672,14 +693,16 @@ func coerceString(s string, minLen, maxLen int, padding string) string {
 	return s
 }
 
-func (l *loadbalancers) buildNodeBalancerNodeCreateOptions(node *v1.Node, nodePort int32) linodego.NodeBalancerNodeCreateOptions {
-	return linodego.NodeBalancerNodeCreateOptions{
-		Address: fmt.Sprintf("%v:%v", getNodePrivateIP(node), nodePort),
-		// NodeBalancer backends must be 3-32 chars in length
-		// If < 3 chars, pad node name with "node-" prefix
-		Label:  coerceString(node.Name, 3, 32, "node-"),
-		Mode:   "accept",
-		Weight: 100,
+func (l *loadbalancers) buildNodeBalancerNodeConfigRebuildOptions(node *v1.Node, nodePort int32) linodego.NodeBalancerConfigRebuildNodeOptions {
+	return linodego.NodeBalancerConfigRebuildNodeOptions{
+		NodeBalancerNodeCreateOptions: linodego.NodeBalancerNodeCreateOptions{
+			Address: fmt.Sprintf("%v:%v", getNodePrivateIP(node), nodePort),
+			// NodeBalancer backends must be 3-32 chars in length
+			// If < 3 chars, pad node name with "node-" prefix
+			Label:  coerceString(node.Name, 3, 32, "node-"),
+			Mode:   "accept",
+			Weight: 100,
+		},
 	}
 }
 

cloud/linode/loadbalancers_test.go

@@ -1788,7 +1788,8 @@ func testUpdateLoadBalancerAddNodeBalancerID(t *testing.T, client *linodego.Clie
 		t.Errorf("UpdateLoadBalancer returned an error while updated annotations: %s", err)
 	}
 
-	lbStatus, _, err := lb.GetLoadBalancer(context.TODO(), svc.ClusterName, svc)
+	clusterName := strings.TrimPrefix(svc.Namespace, "kube-system-")
+	lbStatus, _, err := lb.GetLoadBalancer(context.TODO(), clusterName, svc)
 	if err != nil {
 		t.Errorf("GetLoadBalancer returned an error: %s", err)
 	}

cloud/linode/node_controller.go

@@ -57,7 +57,7 @@ func newNodeController(kubeclient kubernetes.Interface, client client.Client, in
 }
 
 func (s *nodeController) Run(stopCh <-chan struct{}) {
-	s.informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+	_, err := s.informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj interface{}) {
 			node, ok := obj.(*v1.Node)
 			if !ok {
@@ -68,6 +68,9 @@ func (s *nodeController) Run(stopCh <-chan struct{}) {
 			s.queue.Add(node)
 		},
 	})
+	if err != nil {
+		klog.Errorf("NodeController can't handle newly created node's metadata. %s", err)
+	}
 
 	go wait.Until(s.worker, time.Second, stopCh)
 	s.informer.Informer().Run(stopCh)

cloud/linode/service_controller.go

@@ -3,6 +3,7 @@ package linode
 import (
 	"context"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/appscode/go/wait"
@@ -32,7 +33,7 @@ func newServiceController(loadbalancers *loadbalancers, informer v1informers.Ser
 }
 
 func (s *serviceController) Run(stopCh <-chan struct{}) {
-	s.informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+	_, err := s.informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		DeleteFunc: func(obj interface{}) {
 			service, ok := obj.(*v1.Service)
 			if !ok {
@@ -47,6 +48,9 @@ func (s *serviceController) Run(stopCh <-chan struct{}) {
 			s.queue.Add(service)
 		},
 	})
+	if err != nil {
+		klog.Errorf("ServiceController didn't successfully register it's Informer %s", err)
+	}
 
 	go wait.Until(s.worker, time.Second, stopCh)
 	s.informer.Informer().Run(stopCh)
@@ -91,5 +95,6 @@ func (s *serviceController) processNextDeletion() bool {
 
 func (s *serviceController) handleServiceDeleted(service *v1.Service) error {
 	klog.Infof("ServiceController handling service (%s) deletion", getServiceNn(service))
-	return s.loadbalancers.EnsureLoadBalancerDeleted(context.Background(), service.ClusterName, service)
+	clusterName := strings.TrimPrefix(service.Namespace, "kube-system-")
+	return s.loadbalancers.EnsureLoadBalancerDeleted(context.Background(), clusterName, service)
 }

e2e/go.mod

@@ -4,18 +4,18 @@ go 1.20
 
 require (
 	github.com/appscode/go v0.0.0-20200323182826-54e98e09185a
-	github.com/linode/linodego v1.26.0
-	github.com/onsi/ginkgo/v2 v2.13.2
+	github.com/linode/linodego v1.30.0
+	github.com/onsi/ginkgo/v2 v2.17.0
 	github.com/onsi/gomega v1.30.0
 	k8s.io/api v0.23.17
 	k8s.io/apimachinery v0.23.17
-	k8s.io/client-go v0.23.17
+	k8s.io/client-go v1.5.2
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
-	github.com/go-resty/resty/v2 v2.9.1 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-resty/resty/v2 v2.11.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
@@ -28,15 +28,15 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	golang.org/x/tools v0.14.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.66.6 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect