Move CPLB into its own package

Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <[email protected]>
juanluisvaladas · Nov 20, 2024 · c01b136 · c01b136
1 parent bb646e2
commit c01b136
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -44,6 +44,7 @@ import (
 	"github.com/k0sproject/k0s/pkg/certificate"
 	"github.com/k0sproject/k0s/pkg/component/controller"
 	"github.com/k0sproject/k0s/pkg/component/controller/clusterconfig"
+	"github.com/k0sproject/k0s/pkg/component/controller/cplb"
 	"github.com/k0sproject/k0s/pkg/component/controller/leaderelector"
 	"github.com/k0sproject/k0s/pkg/component/controller/workerconfig"
 	"github.com/k0sproject/k0s/pkg/component/manager"
@@ -237,14 +238,14 @@ func (c *command) start(ctx context.Context) error {
 	// Assume a single active controller during startup
 	numActiveControllers := value.NewLatest[uint](1)
 
-	if cplb := nodeConfig.Spec.Network.ControlPlaneLoadBalancing; cplb != nil && cplb.Enabled {
+	if cplbCfg := nodeConfig.Spec.Network.ControlPlaneLoadBalancing; cplbCfg != nil && cplbCfg.Enabled {
 		if c.SingleNode {
 			return errors.New("control plane load balancing cannot be used in a single-node cluster")
 		}
 
-		nodeComponents.Add(ctx, &controller.Keepalived{
+		nodeComponents.Add(ctx, &cplb.Keepalived{
 			K0sVars:         c.K0sVars,
-			Config:          cplb.Keepalived,
+			Config:          cplbCfg.Keepalived,
 			DetailedLogging: c.Debug,
 			LogConfig:       c.Debug,
 			KubeConfigPath:  c.K0sVars.AdminKubeConfigPath,

diff --git a/pkg/component/controller/cplb_linux.go → pkg/component/controller/cplb/cplb_linux.go b/pkg/component/controller/cplb_linux.go → pkg/component/controller/cplb/cplb_linux.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controller
+package cplb
 
 import (
 	"bufio"

diff --git a/pkg/component/controller/cplb_other.go → pkg/component/controller/cplb/cplb_other.go b/pkg/component/controller/cplb_other.go → pkg/component/controller/cplb/cplb_other.go
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controller
+package cplb
 
 import (
 	"context"

diff --git a/pkg/component/controller/cplb_reconciler.go → ...ponent/controller/cplb/cplb_reconciler.go b/pkg/component/controller/cplb_reconciler.go → ...ponent/controller/cplb/cplb_reconciler.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controller
+package cplb
 
 import (
 	"context"

diff --git a/...ponent/controller/cplb_reconciler_test.go → ...t/controller/cplb/cplb_reconciler_test.go b/...ponent/controller/cplb_reconciler_test.go → ...t/controller/cplb/cplb_reconciler_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controller
+package cplb
 
 import (
 	"testing"