Move LLVS to EE

.gitignore

@@ -28,6 +28,7 @@
 .settings
 .idea/
 venv/
+.vscode
 
 # macOS Finder files
 *.DS_Store

api/v1alpha1/lvm_logical_volume_snapshot.go

@@ -1,3 +1,5 @@
+//go:build ee
+
 /*
 Copyright 2024 Flant JSC
 
@@ -21,6 +23,14 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+func init() {
+	knownTypes = append(
+		knownTypes,
+		&LVMLogicalVolumeSnapshot{},
+		&LVMLogicalVolumeSnapshotList{},
+	)
+}
+
 // +k8s:deepcopy-gen=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type LVMLogicalVolumeSnapshotList struct {

api/v1alpha1/register.go

@@ -37,20 +37,20 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
+var knownTypes = []runtime.Object{
+	&BlockDevice{},
+	&BlockDeviceList{},
+	&LVMVolumeGroup{},
+	&LVMVolumeGroupList{},
+	&LVMLogicalVolume{},
+	&LVMLogicalVolumeList{},
+	&LVMVolumeGroupSet{},
+	&LVMVolumeGroupSetList{},
+}
+
 // Adds the list of known types to Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&BlockDevice{},
-		&BlockDeviceList{},
-		&LVMVolumeGroup{},
-		&LVMVolumeGroupList{},
-		&LVMLogicalVolume{},
-		&LVMLogicalVolumeList{},
-		&LVMLogicalVolumeSnapshot{},
-		&LVMLogicalVolumeSnapshotList{},
-		&LVMVolumeGroupSet{},
-		&LVMVolumeGroupSetList{},
-	)
+	scheme.AddKnownTypes(SchemeGroupVersion, knownTypes...)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }

images/agent/src/cmd/llvs.go

@@ -0,0 +1,22 @@
+//go:build !ee
+
+package main
+
+import (
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+
+	"agent/internal/cache"
+	"agent/internal/config"
+	"agent/internal/logger"
+	"agent/internal/monitoring"
+)
+
+func addLLVSReconciler(
+	_ manager.Manager,
+	_ logger.Logger,
+	_ monitoring.Metrics,
+	_ *cache.Cache,
+	_ *config.Config,
+) {
+	// noop
+}

images/agent/src/cmd/llvs_ee.go

@@ -0,0 +1,45 @@
+//go:build ee
+
+package main
+
+import (
+	"os"
+
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+
+	"agent/internal/cache"
+	"agent/internal/config"
+	"agent/internal/controller"
+	"agent/internal/controller/llvs"
+	"agent/internal/logger"
+	"agent/internal/monitoring"
+)
+
+func addLLVSReconciler(
+	mgr manager.Manager,
+	log logger.Logger,
+	metrics monitoring.Metrics,
+	sdsCache *cache.Cache,
+	cfgParams *config.Config,
+) {
+	err := controller.AddReconciler(
+		mgr,
+		log,
+		llvs.NewReconciler(
+			mgr.GetClient(),
+			log,
+			metrics,
+			sdsCache,
+			llvs.ReconcilerConfig{
+				NodeName:                cfgParams.NodeName,
+				LLVRequeueInterval:      cfgParams.LLVRequeueInterval,
+				VolumeGroupScanInterval: cfgParams.VolumeGroupScanInterval,
+				LLVSRequeueInterval:     cfgParams.LLVSRequeueInterval,
+			},
+		),
+	)
+	if err != nil {
+		log.Error(err, "[main] unable to start llvs.NewReconciler")
+		os.Exit(1)
+	}
+}

images/agent/src/cmd/main.go

@@ -38,7 +38,6 @@ import (
 	"agent/internal/controller/bd"
 	"agent/internal/controller/llv"
 	"agent/internal/controller/llv_extender"
-	"agent/internal/controller/llvs"
 	"agent/internal/controller/lvg"
 	"agent/internal/kubutils"
 	"agent/internal/logger"
@@ -234,26 +233,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	err = controller.AddReconciler(
-		mgr,
-		log,
-		llvs.NewReconciler(
-			mgr.GetClient(),
-			log,
-			metrics,
-			sdsCache,
-			llvs.ReconcilerConfig{
-				NodeName:                cfgParams.NodeName,
-				LLVRequeueInterval:      cfgParams.LLVRequeueInterval,
-				VolumeGroupScanInterval: cfgParams.VolumeGroupScanInterval,
-				LLVSRequeueInterval:     cfgParams.LLVSRequeueInterval,
-			},
-		),
-	)
-	if err != nil {
-		log.Error(err, "[main] unable to start llvs.NewReconciler")
-		os.Exit(1)
-	}
+	addLLVSReconciler(mgr, log, metrics, sdsCache, cfgParams)
 
 	if err = mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		log.Error(err, "[main] unable to mgr.AddHealthzCheck")

images/agent/src/internal/controller/llv/llvs.go

@@ -0,0 +1,14 @@
+//go:build !ee
+
+package llv
+
+import (
+	"context"
+	"errors"
+
+	"github.com/deckhouse/sds-node-configurator/api/v1alpha1"
+)
+
+func (r *Reconciler) handleLLVSSource(_ context.Context, _ *v1alpha1.LVMLogicalVolume, _ *v1alpha1.LVMVolumeGroup) (string, bool, error) {
+	return "", false, errors.New("LLVS as a source is not supported")
+}

images/agent/src/internal/controller/llv/llvs_ee.go

@@ -0,0 +1,30 @@
+//go:build ee
+
+package llv
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/deckhouse/sds-node-configurator/api/v1alpha1"
+	"k8s.io/apimachinery/pkg/types"
+
+	"agent/internal/utils"
+)
+
+func (r *Reconciler) handleLLVSSource(ctx context.Context, llv *v1alpha1.LVMLogicalVolume, lvg *v1alpha1.LVMVolumeGroup) (string, bool, error) {
+	sourceLLVS := &v1alpha1.LVMLogicalVolumeSnapshot{}
+	if err := r.cl.Get(ctx, types.NamespacedName{Name: llv.Spec.Source.Name}, sourceLLVS); err != nil {
+		r.log.Error(err, fmt.Sprintf("[reconcileLLVCreateFunc] unable to get source LVMLogicalVolumeSnapshot %s for the LVMLogicalVolume %s", llv.Spec.Source.Name, llv.Name))
+		return "", true, err
+	}
+
+	if sourceLLVS.Status.ActualVGNameOnTheNode != lvg.Spec.ActualVGNameOnTheNode || sourceLLVS.Status.NodeName != lvg.Spec.Local.NodeName {
+		return "", false, errors.New("restored volume should be in the same volume group as the origin volume")
+	}
+
+	cmd, err := utils.CreateThinLogicalVolumeFromSource(llv.Spec.ActualLVNameOnTheNode, sourceLLVS.Status.ActualVGNameOnTheNode, sourceLLVS.Spec.ActualSnapshotNameOnTheNode)
+
+	return cmd, err != nil, err
+}

images/agent/src/internal/controller/llv/reconciler.go

@@ -280,17 +280,11 @@ func (r *Reconciler) reconcileLLVCreateFunc(
 
 		cmd, err = utils.CreateThinLogicalVolumeFromSource(llv.Spec.ActualLVNameOnTheNode, lvg.Spec.ActualVGNameOnTheNode, sourceLLV.Spec.ActualLVNameOnTheNode)
 	case llv.Spec.Source.Kind == "LVMLogicalVolumeSnapshot":
-		sourceLLVS := &v1alpha1.LVMLogicalVolumeSnapshot{}
-		if err := r.cl.Get(ctx, types.NamespacedName{Name: llv.Spec.Source.Name}, sourceLLVS); err != nil {
-			r.log.Error(err, fmt.Sprintf("[reconcileLLVCreateFunc] unable to get source LVMLogicalVolumeSnapshot %s for the LVMLogicalVolume %s", llv.Spec.Source.Name, llv.Name))
-			return true, err
-		}
-
-		if sourceLLVS.Status.ActualVGNameOnTheNode != lvg.Spec.ActualVGNameOnTheNode || sourceLLVS.Status.NodeName != lvg.Spec.Local.NodeName {
-			return false, errors.New("restored volume should be in the same volume group as the origin volume")
+		cmdTmp, shouldRequeue, err := r.handleLLVSSource(ctx, llv, lvg)
+		if err != nil {
+			return shouldRequeue, err
 		}
-
-		cmd, err = utils.CreateThinLogicalVolumeFromSource(llv.Spec.ActualLVNameOnTheNode, sourceLLVS.Status.ActualVGNameOnTheNode, sourceLLVS.Spec.ActualSnapshotNameOnTheNode)
+		cmd = cmdTmp
 	}
 	r.log.Debug(fmt.Sprintf("[reconcileLLVCreateFunc] ran cmd: %s", cmd))
 	if err != nil {

images/agent/src/internal/controller/llvs/reconciler.go → images/agent/src/internal/controller/llvs/reconciler_ee.go

@@ -1,3 +1,5 @@
+//go:build ee
+
 package llvs
 
 import (