store NB config ID in LinodeCluster network spec (#85)

linode · Feb 7, 2024 · 6abe490 · 6abe490
1 parent f1bc15e
commit 6abe490
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 60 deletions.
diff --git a/api/v1alpha1/linodecluster_types.go b/api/v1alpha1/linodecluster_types.go
@@ -103,6 +103,9 @@ type NetworkSpec struct {
 	// NodeBalancerID is the id of api server NodeBalancer.
 	// +optional
 	NodeBalancerID int `json:"nodeBalancerID,omitempty"`
+	// NodeBalancerConfigID is the config ID of api server NodeBalancer.
+	// +optional
+	NodeBalancerConfigID *int `json:"nodeBalancerConfigID,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/cloud/services/loadbalancers.go b/cloud/services/loadbalancers.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net/http"
 	"slices"
-	"strconv"
 
 	"github.com/go-logr/logr"
 	"github.com/linode/cluster-api-provider-linode/cloud/scope"
@@ -16,7 +15,7 @@ import (
 	kutil "sigs.k8s.io/cluster-api/util"
 )
 
-var (
+const (
 	defaultLBPort = 6443
 )
 
@@ -85,17 +84,6 @@ func CreateNodeBalancerConfig(
 	var linodeNBConfig *linodego.NodeBalancerConfig
 	var err error
 
-	if linodeNBConfig, err = GetNodeBalancerConfig(ctx, clusterScope, logger); err != nil {
-		logger.Info("Failed to list NodeBalancer Configs", "error", err.Error())
-
-		return nil, err
-	}
-	if linodeNBConfig != nil {
-		logger.Info("NodeBalancer ", strconv.Itoa(linodeNBConfig.ID), " already exists")
-
-		return linodeNBConfig, err
-	}
-
 	lbPort := defaultLBPort
 	if clusterScope.LinodeCluster.Spec.Network.LoadBalancerPort != 0 {
 		lbPort = clusterScope.LinodeCluster.Spec.Network.LoadBalancerPort
@@ -120,38 +108,12 @@ func CreateNodeBalancerConfig(
 	return linodeNBConfig, nil
 }
 
-// GetNodeBalancerConfig gets the first NodeBalancer config
-func GetNodeBalancerConfig(
-	ctx context.Context,
-	clusterScope *scope.ClusterScope,
-	logger logr.Logger,
-) (*linodego.NodeBalancerConfig, error) {
-	var linodeNBConfigs []linodego.NodeBalancerConfig
-	var err error
-
-	if linodeNBConfigs, err = clusterScope.LinodeClient.ListNodeBalancerConfigs(
-		ctx,
-		clusterScope.LinodeCluster.Spec.Network.NodeBalancerID,
-		linodego.NewListOptions(1, ""),
-	); err != nil {
-		logger.Info("Failed to list NodeBalancer Configs", "error", err.Error())
-
-		return nil, err
-	}
-	if len(linodeNBConfigs) == 0 {
-		return nil, err
-	}
-
-	return &linodeNBConfigs[0], err
-}
-
 // AddNodeToNB adds a backend Node on the Node Balancer configuration
 func AddNodeToNB(
 	ctx context.Context,
 	logger logr.Logger,
 	machineScope *scope.MachineScope,
 	clusterScope *scope.ClusterScope,
-	linodeInstance *linodego.Instance,
 ) error {
 	// Update the NB backend with the new instance if it's a control plane node
 	if !kutil.IsControlPlaneMachine(machineScope.Machine) {
@@ -171,19 +133,23 @@ func AddNodeToNB(
 		return err
 	}
 
-	linodeNBConfig, err := GetNodeBalancerConfig(ctx, clusterScope, logger)
-	if err != nil {
-		logger.Error(err, "Failed to get Node Balancer config")
+	lbPort := defaultLBPort
+	if clusterScope.LinodeCluster.Spec.Network.LoadBalancerPort != 0 {
+		lbPort = clusterScope.LinodeCluster.Spec.Network.LoadBalancerPort
+	}
+	if machineScope.LinodeCluster.Spec.Network.NodeBalancerConfigID == nil {
+		err := errors.New("nil NodeBalancer Config ID")
+		logger.Error(err, "config ID for NodeBalancer is nil")
 
 		return err
 	}
 	_, err = machineScope.LinodeClient.CreateNodeBalancerNode(
 		ctx,
 		machineScope.LinodeCluster.Spec.Network.NodeBalancerID,
-		linodeNBConfig.ID,
+		*machineScope.LinodeCluster.Spec.Network.NodeBalancerConfigID,
 		linodego.NodeBalancerNodeCreateOptions{
 			Label:   machineScope.Cluster.Name,
-			Address: fmt.Sprintf("%s:%d", addresses.IPv4.Private[0].Address, linodeNBConfig.Port),
+			Address: fmt.Sprintf("%s:%d", addresses.IPv4.Private[0].Address, lbPort),
 			Mode:    linodego.ModeAccept,
 		},
 	)
@@ -201,7 +167,6 @@ func DeleteNodeFromNB(
 	ctx context.Context,
 	logger logr.Logger,
 	machineScope *scope.MachineScope,
-	clusterScope *scope.ClusterScope,
 ) error {
 	// Update the NB to remove the node if it's a control plane node
 	if !kutil.IsControlPlaneMachine(machineScope.Machine) {
@@ -212,17 +177,10 @@ func DeleteNodeFromNB(
 		return errors.New("no InstanceID")
 	}
 
-	linodeNBConfig, err := GetNodeBalancerConfig(ctx, clusterScope, logger)
-	if util.IgnoreLinodeAPIError(err, http.StatusNotFound) != nil || linodeNBConfig == nil {
-		logger.Error(err, "Failed to get Node Balancer config")
-
-		return err
-	}
-
-	err = machineScope.LinodeClient.DeleteNodeBalancerNode(
+	err := machineScope.LinodeClient.DeleteNodeBalancerNode(
 		ctx,
 		machineScope.LinodeCluster.Spec.Network.NodeBalancerID,
-		linodeNBConfig.ID,
+		*machineScope.LinodeCluster.Spec.Network.NodeBalancerConfigID,
 		*machineScope.LinodeMachine.Spec.InstanceID,
 	)
 	if util.IgnoreLinodeAPIError(err, http.StatusNotFound) != nil {

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclusters.yaml
@@ -85,6 +85,10 @@ spec:
                     enum:
                     - NodeBalancer
                     type: string
+                  nodeBalancerConfigID:
+                    description: NodeBalancerConfigID is the config ID of api server
+                      NodeBalancer.
+                    type: integer
                   nodeBalancerID:
                     description: NodeBalancerID is the id of api server NodeBalancer.
                     type: integer

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclustertemplates.yaml
@@ -80,6 +80,10 @@ spec:
                             enum:
                             - NodeBalancer
                             type: string
+                          nodeBalancerConfigID:
+                            description: NodeBalancerConfigID is the config ID of
+                              api server NodeBalancer.
+                            type: integer
                           nodeBalancerID:
                             description: NodeBalancerID is the id of api server NodeBalancer.
                             type: integer

diff --git a/controller/linodecluster_controller.go b/controller/linodecluster_controller.go
@@ -178,6 +178,8 @@ func (r *LinodeClusterReconciler) reconcileCreate(ctx context.Context, logger lo
 		return err
 	}
 
+	clusterScope.LinodeCluster.Spec.Network.NodeBalancerConfigID = util.Pointer(linodeNBConfig.ID)
+
 	clusterScope.LinodeCluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
 		Host: *linodeNB.IPv4,
 		Port: int32(linodeNBConfig.Port),
@@ -210,6 +212,7 @@ func (r *LinodeClusterReconciler) reconcileDelete(ctx context.Context, logger lo
 	conditions.MarkFalse(clusterScope.LinodeCluster, clusterv1.ReadyCondition, clusterv1.DeletedReason, clusterv1.ConditionSeverityInfo, "Load balancer deleted")
 
 	clusterScope.LinodeCluster.Spec.Network.NodeBalancerID = 0
+	clusterScope.LinodeCluster.Spec.Network.NodeBalancerConfigID = nil
 	controllerutil.RemoveFinalizer(clusterScope.LinodeCluster, infrav1alpha1.GroupVersion.String())
 
 	return nil

diff --git a/controller/linodemachine_controller.go b/controller/linodemachine_controller.go
@@ -233,7 +233,7 @@ func (r *LinodeMachineReconciler) reconcile(
 	if !machineScope.LinodeMachine.ObjectMeta.DeletionTimestamp.IsZero() {
 		failureReason = cerrs.DeleteMachineError
 
-		err = r.reconcileDelete(ctx, logger, machineScope, clusterScope)
+		err = r.reconcileDelete(ctx, logger, machineScope)
 
 		return
 	}
@@ -363,7 +363,7 @@ func (r *LinodeMachineReconciler) reconcileCreate(
 		})
 	}
 
-	if err = services.AddNodeToNB(ctx, logger, machineScope, clusterScope, linodeInstance); err != nil {
+	if err = services.AddNodeToNB(ctx, logger, machineScope, clusterScope); err != nil {
 		logger.Error(err, "Failed to add instance to Node Balancer backend")
 
 		return err
@@ -397,7 +397,7 @@ func (r *LinodeMachineReconciler) reconcileUpdate(
 			machineScope.LinodeMachine.Spec.ProviderID = nil
 			machineScope.LinodeMachine.Spec.InstanceID = nil
 
-			conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, string("missing"), clusterv1.ConditionSeverityWarning, "instance not found")
+			conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, "missing", clusterv1.ConditionSeverityWarning, "instance not found")
 		}
 
 		return res, err
@@ -436,7 +436,6 @@ func (r *LinodeMachineReconciler) reconcileDelete(
 	ctx context.Context,
 	logger logr.Logger,
 	machineScope *scope.MachineScope,
-	clusterScope *scope.ClusterScope,
 ) error {
 	logger.Info("deleting machine")
 
@@ -447,7 +446,7 @@ func (r *LinodeMachineReconciler) reconcileDelete(
 		return nil
 	}
 
-	err := services.DeleteNodeFromNB(ctx, logger, machineScope, clusterScope)
+	err := services.DeleteNodeFromNB(ctx, logger, machineScope)
 	if err != nil {
 		logger.Error(err, "Failed to remove node from Node Balancer backend")