fix review feedback

Signed-off-by: Alexandr Stefurishin <[email protected]>

api/v1alpha1/lvm_logical_volume_snapshot.go

@@ -42,15 +42,16 @@ type LVMLogicalVolumeSnapshot struct {
 
 // +k8s:deepcopy-gen=true
 type LVMLogicalVolumeSnapshotSpec struct {
-	NodeName             string `json:"nodeName"`
-	LVMVolumeGroupName   string `json:"lvmVolumeGroupName"`
-	LVMLogicalVolumeName string `json:"lvmLogicalVolumeName"`
+	NodeName                    string `json:"nodeName"`
+	ActualVGNameOnTheNode       string `json:"actualVGNameOnTheNode"`
+	ActualLVNameOnTheNode       string `json:"actualLVNameOnTheNode"`
+	ActualSnapshotNameOnTheNode string `json:"actualSnapshotNameOnTheNode"`
 }
 
 // +k8s:deepcopy-gen=true
 type LVMLogicalVolumeSnapshotStatus struct {
-	Phase      string            `json:"phase"`
-	Reason     string            `json:"reason"`
-	Size       resource.Quantity `json:"size"`
-	ActualSize resource.Quantity `json:"actualSize"`
+	Phase    string            `json:"phase"`
+	Reason   string            `json:"reason"`
+	Size     resource.Quantity `json:"size"`
+	UsedSize resource.Quantity `json:"usedSize"`
 }

crds/lvmlogicalvolumesnapshot.yaml

@@ -43,18 +43,26 @@ spec:
                     - rule: self == oldSelf
                       message: Value is immutable.
                   minLength: 1
-                lvmVolumeGroupName:
+                actualVGNameOnTheNode:
                   type: string
                   description: |
                     The name of the volume group, where the snapshot resides in.
                   x-kubernetes-validations:
                     - rule: self == oldSelf
                       message: Value is immutable.
                   minLength: 1
-                lvmLogicalVolumeName:
+                actualLVNameOnTheNode:
                   type: string
                   description: |
-                    The name of the LVMLogicalVolume resource the snapshot is created from.
+                    The name of the volume the snapshot is created from.
+                  x-kubernetes-validations:
+                    - rule: self == oldSelf
+                      message: Value is immutable.
+                  minLength: 1
+                actualSnapshotNameOnTheNode:
+                  type: string
+                  description: |
+                    The name of the snapshot volume.
                   x-kubernetes-validations:
                     - rule: self == oldSelf
                       message: Value is immutable.
@@ -77,7 +85,7 @@ spec:
                   description: |
                     Snapshotted LV size on the node.
                   type: string
-                actualSize:
+                usedSize:
                   description: |
                     Snapshot LV size on the node.
                   type: string
@@ -96,7 +104,7 @@ spec:
           name: Size
           type: string
           description: Snapshotted LV size.
-        - jsonPath: .status.actualSize
-          name: ActualSize
+        - jsonPath: .status.usedSize
+          name: UsedSize
           type: string
           description: Snapshot size.

images/agent/src/cmd/main.go

@@ -38,6 +38,7 @@ 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"
@@ -214,21 +215,45 @@ func main() {
 		os.Exit(1)
 	}
 
-	err = controller.AddReconciler(mgr, log, llv_extender.NewReconciler(
-		mgr.GetClient(),
+	err = controller.AddReconciler(
+		mgr,
 		log,
-		metrics,
-		sdsCache,
-		llv_extender.ReconcilerConfig{
-			NodeName:                cfgParams.NodeName,
-			VolumeGroupScanInterval: cfgParams.VolumeGroupScanInterval,
-		},
-	))
+		llv_extender.NewReconciler(
+			mgr.GetClient(),
+			log,
+			metrics,
+			sdsCache,
+			llv_extender.ReconcilerConfig{
+				NodeName:                cfgParams.NodeName,
+				VolumeGroupScanInterval: cfgParams.VolumeGroupScanInterval,
+			},
+		),
+	)
 	if err != nil {
 		log.Error(err, "[main] unable to controller.RunLVMLogicalVolumeExtenderWatcherController")
 		os.Exit(1)
 	}
 
+	err = controller.AddReconciler(
+		mgr,
+		log,
+		llvs.NewReconciler(
+			mgr.GetClient(),
+			log,
+			metrics,
+			sdsCache,
+			llvs.ReconcilerConfig{
+				NodeName:            cfgParams.NodeName,
+				LLVRequeueInterval:  cfgParams.LLVRequeueInterval,
+				LLVSRequeueInterval: cfgParams.LLVSRequeueInterval,
+			},
+		),
+	)
+	if err != nil {
+		log.Error(err, "[main] unable to start llvs.NewReconciler")
+		os.Exit(1)
+	}
+
 	if err = mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		log.Error(err, "[main] unable to mgr.AddHealthzCheck")
 		os.Exit(1)

images/agent/src/internal/config/config.go

@@ -49,6 +49,7 @@ type Config struct {
 	BlockDeviceScanInterval time.Duration
 	VolumeGroupScanInterval time.Duration
 	LLVRequeueInterval      time.Duration
+	LLVSRequeueInterval     time.Duration
 	ThrottleInterval        time.Duration
 	CmdDeadlineDuration     time.Duration
 	HealthProbeBindAddress  string
@@ -90,6 +91,7 @@ func NewConfig() (*Config, error) {
 		cfg.BlockDeviceScanInterval = 5 * time.Second
 		cfg.VolumeGroupScanInterval = 5 * time.Second
 		cfg.LLVRequeueInterval = 5 * time.Second
+		cfg.LLVSRequeueInterval = 5 * time.Second
 	} else {
 		interval, err := strconv.Atoi(scanInt)
 		if err != nil {
@@ -98,6 +100,7 @@ func NewConfig() (*Config, error) {
 		cfg.BlockDeviceScanInterval = time.Duration(interval) * time.Second
 		cfg.VolumeGroupScanInterval = time.Duration(interval) * time.Second
 		cfg.LLVRequeueInterval = time.Duration(interval) * time.Second
+		cfg.LLVSRequeueInterval = time.Duration(interval) * time.Second
 	}
 
 	thrInt := os.Getenv(ThrottleInterval)

images/agent/src/internal/const.go

@@ -85,6 +85,7 @@ const (
 	LLVSStatusPhaseCreated = "Created"
 	LLVSStatusPhasePending = "Pending"
 	LLVSStatusPhaseFailed  = "Failed"
+	LLVSNameTag            = "storage.deckhouse.io/lvmLogicalVolumeSnapshotName"
 
 	Local  = "Local"
 	Shared = "Shared"

images/agent/src/internal/controller/bd/discoverer.go

@@ -222,7 +222,7 @@ func (d *Discoverer) getBlockDeviceCandidates() []internal.BlockDeviceCandidate
 			if pv.PVName == device.Name {
 				d.log.Trace(fmt.Sprintf("[GetBlockDeviceCandidates] The device is a PV. Found PV name: %s", pv.PVName))
 				if candidate.FSType == internal.LVMFSType {
-					hasTag, lvmVGName := utils.CheckTag(pv.VGTags)
+					hasTag, lvmVGName := utils.ReadValueFromTags(pv.VGTags, internal.LVMVolumeGroupTag)
 					if hasTag {
 						d.log.Debug(fmt.Sprintf("[GetBlockDeviceCandidates] PV %s of BlockDevice %s has tag, fill the VG information", pv.PVName, candidate.Name))
 						candidate.PVUuid = pv.PVUuid

images/agent/src/internal/controller/bd/discoverer_test.go

@@ -550,7 +550,7 @@ func TestBlockDeviceCtrl(t *testing.T) {
 			expectedName := "testName"
 			tags := fmt.Sprintf("storage.deckhouse.io/enabled=true,storage.deckhouse.io/lvmVolumeGroupName=%s", expectedName)
 
-			shouldBeTrue, actualName := utils.CheckTag(tags)
+			shouldBeTrue, actualName := utils.ReadValueFromTags(tags, internal.LVMVolumeGroupTag)
 			if assert.True(t, shouldBeTrue) {
 				assert.Equal(t, expectedName, actualName)
 			}
@@ -559,7 +559,7 @@ func TestBlockDeviceCtrl(t *testing.T) {
 		t.Run("Haven't tag_Returns false and empty", func(t *testing.T) {
 			tags := "someWeirdTags=oMGwtFIsThis"
 
-			shouldBeFalse, actualName := utils.CheckTag(tags)
+			shouldBeFalse, actualName := utils.ReadValueFromTags(tags, internal.LVMVolumeGroupTag)
 			if assert.False(t, shouldBeFalse) {
 				assert.Equal(t, "", actualName)
 			}

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

@@ -35,6 +35,7 @@ type Named interface {
 type Reconciler[T client.Object] interface {
 	Named
 	MaxConcurrentReconciles() int
+	ShouldReconcileCreate(objectNew T) bool
 	ShouldReconcileUpdate(objectOld T, objectNew T) bool
 	Reconcile(context.Context, ReconcileRequest[T]) (Result, error)
 }
@@ -86,6 +87,11 @@ func AddReconciler[T client.Object](
 					e event.TypedCreateEvent[T],
 					q workqueue.TypedRateLimitingInterface[reconcile.Request],
 				) {
+					if !reconciler.ShouldReconcileCreate(e.Object) {
+						log.Debug(fmt.Sprintf("createFunc skipped a request for the %s %s to the Reconcilers queue", tname, e.Object.GetName()))
+						return
+					}
+
 					log.Info(fmt.Sprintf("createFunc got a create event for the %s, name: %s", tname, e.Object.GetName()))
 
 					request := reconcile.Request{NamespacedName: types.NamespacedName{Namespace: e.Object.GetNamespace(), Name: e.Object.GetName()}}

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

@@ -77,6 +77,11 @@ func (r *Reconciler) MaxConcurrentReconciles() int {
 	return 10
 }
 
+// ShouldReconcileCreate implements controller.Reconciler.
+func (r *Reconciler) ShouldReconcileCreate(_ *v1alpha1.LVMLogicalVolume) bool {
+	return true
+}
+
 // ShouldReconcileUpdate implements controller.Reconciler.
 func (r *Reconciler) ShouldReconcileUpdate(objectOld *v1alpha1.LVMLogicalVolume, objectNew *v1alpha1.LVMLogicalVolume) bool {
 	r.log.Info(fmt.Sprintf("[RunLVMLogicalVolumeWatcherController] got an update event for the LVMLogicalVolume: %s", objectNew.GetName()))
@@ -429,7 +434,7 @@ func (r *Reconciler) reconcileLLVDeleteFunc(
 
 	err = r.removeLLVFinalizersIfExist(ctx, llv)
 	if err != nil {
-		r.log.Error(err, fmt.Sprintf("[reconcileLLVDeleteFunc] unable to remove finalizers from the LVMVolumeGroup %s", llv.Name))
+		r.log.Error(err, fmt.Sprintf("[reconcileLLVDeleteFunc] unable to remove finalizers from the LVMLogicalVolume %s", llv.Name))
 		return true, err
 	}
 

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

@@ -74,6 +74,11 @@ func (r *Reconciler) ShouldReconcileUpdate(_ *v1alpha1.LVMVolumeGroup, _ *v1alph
 	return true
 }
 
+// ShouldReconcileCreate implements controller.Reconciler.
+func (r *Reconciler) ShouldReconcileCreate(_ *v1alpha1.LVMVolumeGroup) bool {
+	return true
+}
+
 // Reconcile implements controller.Reconciler.
 func (r *Reconciler) Reconcile(
 	ctx context.Context,