add konnectivity flavor for kubeadm

linode · Jun 6, 2024 · 2ea608d · 2ea608d
1 parent 9cd0d2d
commit 2ea608d
Show file tree

Hide file tree

Showing 19 changed files with 537 additions and 43 deletions.
diff --git a/.github/filters.yml b/.github/filters.yml
@@ -20,6 +20,8 @@ kubeadm_self-healing:
   - templates/flavors/kubeadm/self-healing/*
 kubeadm_vpcless:
   - templates/flavors/kubeadm/vpcless/*
+kubeadm_konnectivity:
+  - templates/flavors/kubeadm/konnectivity/*
 
 k3s:
   - templates/flavors/k3s/default/*

diff --git a/api/v1alpha1/linodecluster_conversion.go b/api/v1alpha1/linodecluster_conversion.go
@@ -36,10 +36,13 @@ func (src *LinodeCluster) ConvertTo(dstRaw conversion.Hub) error {
 
 	// Spec
 	dst.Spec.Network = infrastructurev1alpha2.NetworkSpec{
-		LoadBalancerType:              src.Spec.Network.LoadBalancerType,
-		ApiserverLoadBalancerPort:     src.Spec.Network.LoadBalancerPort,
-		NodeBalancerID:                src.Spec.Network.NodeBalancerID,
-		ApiserverNodeBalancerConfigID: src.Spec.Network.NodeBalancerConfigID,
+		LoadBalancerType:                 src.Spec.Network.LoadBalancerType,
+		ApiserverLoadBalancerPort:        src.Spec.Network.LoadBalancerPort,
+		NodeBalancerID:                   src.Spec.Network.NodeBalancerID,
+		ApiserverNodeBalancerConfigID:    src.Spec.Network.NodeBalancerConfigID,
+		Konnectivity:                     false,
+		KonnectivityLoadBalancerPort:     0,
+		KonnectivityNodeBalancerConfigID: nil,
 	}
 	dst.Spec.ControlPlaneEndpoint = src.Spec.ControlPlaneEndpoint
 	dst.Spec.Region = src.Spec.Region

diff --git a/api/v1alpha1/linodecluster_conversion_test.go b/api/v1alpha1/linodecluster_conversion_test.go
@@ -59,6 +59,7 @@ func TestConvertTo(t *testing.T) {
 				NodeBalancerID:                ptr.To(1234),
 				ApiserverLoadBalancerPort:     12345,
 				ApiserverNodeBalancerConfigID: ptr.To(2345),
+				Konnectivity:                  false,
 			},
 			ControlPlaneEndpoint: clusterv1.APIEndpoint{Host: "1.2.3.4"},
 			Region:               "test-region",
@@ -94,10 +95,13 @@ func TestConvertFrom(t *testing.T) {
 		},
 		Spec: infrav1alpha2.LinodeClusterSpec{
 			Network: infrav1alpha2.NetworkSpec{
-				LoadBalancerType:              "test-type",
-				NodeBalancerID:                ptr.To(1234),
-				ApiserverLoadBalancerPort:     12345,
-				ApiserverNodeBalancerConfigID: ptr.To(2345),
+				LoadBalancerType:                 "test-type",
+				NodeBalancerID:                   ptr.To(1234),
+				ApiserverLoadBalancerPort:        12345,
+				ApiserverNodeBalancerConfigID:    ptr.To(2345),
+				Konnectivity:                     true,
+				KonnectivityLoadBalancerPort:     2222,
+				KonnectivityNodeBalancerConfigID: ptr.To(1111),
 			},
 			ControlPlaneEndpoint: clusterv1.APIEndpoint{Host: "1.2.3.4"},
 			Region:               "test-region",

diff --git a/api/v1alpha2/linodecluster_types.go b/api/v1alpha2/linodecluster_types.go
@@ -113,6 +113,20 @@ type NetworkSpec struct {
 	// apiserverNodeBalancerConfigID is the config ID of api server NodeBalancer fonfig.
 	// +optional
 	ApiserverNodeBalancerConfigID *int `json:"apiserverNodeBalancerConfigID,omitempty"`
+	// Konnectivity flag tells whether or not the cluster is configured to use konnectivity.
+	// If omitted, default value is false.
+	// +kubebuilder:validation:Type=boolean
+	// +optional
+	Konnectivity bool `json:"konnectivity,omitempty"`
+	// konnectivityLoadBalancerPort used by the konnectivity server. It must be valid ports range (1-65535).
+	// If omitted, default value is 8132.
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	// +optional
+	KonnectivityLoadBalancerPort int `json:"konnectivityLoadBalancerPort,omitempty"`
+	// konnectivityNodeBalancerConfigID is the config ID of konnectivity server NodeBalancer config.
+	// +optional
+	KonnectivityNodeBalancerConfigID *int `json:"konnectivityNodeBalancerConfigID,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha2/linodecluster_webhook_test.go b/api/v1alpha2/linodecluster_webhook_test.go
@@ -43,6 +43,7 @@ func TestValidateLinodeCluster(t *testing.T) {
 				Region: "example",
 				Network: NetworkSpec{
 					LoadBalancerType: "NodeBalancer",
+					Konnectivity:     true,
 				},
 			},
 		}

diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go
diff --git a/cloud/services/loadbalancers.go b/cloud/services/loadbalancers.go
@@ -16,7 +16,8 @@ import (
 )
 
 const (
-	defaultApiserverLBPort = 6443
+	defaultApiserverLBPort    = 6443
+	defaultKonnectivityLBPort = 8132
 )
 
 // CreateNodeBalancer creates a new NodeBalancer if one doesn't exist
@@ -100,6 +101,33 @@ func CreateNodeBalancerConfigs(
 	}
 	nbConfigs = append(nbConfigs, apiserverLinodeNBConfig)
 
+	// return if konnectivity should not be configured
+	if !clusterScope.LinodeCluster.Spec.Network.Konnectivity {
+		return nbConfigs, nil
+	}
+
+	konnLBPort := defaultKonnectivityLBPort
+	if clusterScope.LinodeCluster.Spec.Network.KonnectivityLoadBalancerPort != 0 {
+		konnLBPort = clusterScope.LinodeCluster.Spec.Network.KonnectivityLoadBalancerPort
+	}
+	konnectivityCreateConfig := linodego.NodeBalancerConfigCreateOptions{
+		Port:      konnLBPort,
+		Protocol:  linodego.ProtocolTCP,
+		Algorithm: linodego.AlgorithmRoundRobin,
+		Check:     linodego.CheckConnection,
+	}
+
+	konnectivityLinodeNBConfig, err := clusterScope.LinodeClient.CreateNodeBalancerConfig(
+		ctx,
+		*clusterScope.LinodeCluster.Spec.Network.NodeBalancerID,
+		konnectivityCreateConfig,
+	)
+	if err != nil {
+		logger.Info("Failed to create Linode NodeBalancer config", "error", err.Error())
+		return nil, err
+	}
+	nbConfigs = append(nbConfigs, konnectivityLinodeNBConfig)
+
 	return nbConfigs, nil
 }
 
@@ -155,6 +183,38 @@ func AddNodeToNB(
 		return err
 	}
 
+	// return if konnectivity should not be configured
+	if !machineScope.LinodeCluster.Spec.Network.Konnectivity {
+		return nil
+	}
+
+	konnectivityLBPort := defaultKonnectivityLBPort
+	if machineScope.LinodeCluster.Spec.Network.KonnectivityLoadBalancerPort != 0 {
+		konnectivityLBPort = machineScope.LinodeCluster.Spec.Network.KonnectivityLoadBalancerPort
+	}
+
+	if machineScope.LinodeCluster.Spec.Network.KonnectivityNodeBalancerConfigID == 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,
+		*machineScope.LinodeCluster.Spec.Network.KonnectivityNodeBalancerConfigID,
+		linodego.NodeBalancerNodeCreateOptions{
+			Label:   machineScope.Cluster.Name,
+			Address: fmt.Sprintf("%s:%d", addresses.IPv4.Private[0].Address, konnectivityLBPort),
+			Mode:    linodego.ModeAccept,
+		},
+	)
+	if err != nil {
+		logger.Error(err, "Failed to update Node Balancer")
+		return err
+	}
+
 	return nil
 }
 
@@ -187,5 +247,20 @@ func DeleteNodeFromNB(
 		return err
 	}
 
+	if !machineScope.LinodeCluster.Spec.Network.Konnectivity {
+		return nil
+	}
+
+	err = machineScope.LinodeClient.DeleteNodeBalancerNode(
+		ctx,
+		*machineScope.LinodeCluster.Spec.Network.NodeBalancerID,
+		*machineScope.LinodeCluster.Spec.Network.KonnectivityNodeBalancerConfigID,
+		*machineScope.LinodeMachine.Spec.InstanceID,
+	)
+	if util.IgnoreLinodeAPIError(err, http.StatusNotFound) != nil {
+		logger.Error(err, "Failed to update Node Balancer")
+		return err
+	}
+
 	return nil
 }