feat(vd): resize-condition-to-resizing

Signed-off-by: Daniil Antoshin <[email protected]> fix: tests Signed-off-by: Daniil Antoshin <[email protected]> fix Signed-off-by: Daniil Antoshin <[email protected]>
deckhouse · Dec 12, 2024 · 412e37a · 412e37a
1 parent afe682a
commit 412e37a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/api/core/v1alpha2/vdcondition/condition.go b/api/core/v1alpha2/vdcondition/condition.go
@@ -28,8 +28,8 @@ const (
 	DatasourceReadyType Type = "DatasourceReady"
 	// ReadyType indicates whether the import process succeeded and the `VirtualDisk` is ready for use.
 	ReadyType Type = "Ready"
-	// ResizedType indicates whether the disk resizing operation is completed.
-	ResizedType Type = "Resized"
+	// ResizingType indicates whether the disk resizing operation is completed.
+	ResizingType Type = "Resizing"
 	// SnapshottingType indicates whether the disk snapshotting operation is in progress.
 	SnapshottingType Type = "Snapshotting"
 	// StorageClassReadyType indicates whether the storage class is ready.

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/resizing.go b/images/virtualization-artifact/pkg/controller/vd/internal/resizing.go
@@ -48,8 +48,8 @@ func NewResizingHandler(diskService DiskService) *ResizingHandler {
 func (h ResizingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (reconcile.Result, error) {
 	log := logger.FromContext(ctx).With(logger.SlogHandler("resizing"))
 
-	condition, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
-	cb := conditions.NewConditionBuilder(vdcondition.ResizedType).Generation(vd.Generation)
+	condition, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
+	cb := conditions.NewConditionBuilder(vdcondition.ResizingType).Generation(vd.Generation)
 
 	defer func() { conditions.SetCondition(cb, &vd.Status.Conditions) }()
 
@@ -107,7 +107,7 @@ func (h ResizingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (re
 
 		vd.Status.Phase = virtv2.DiskResizing
 		cb.
-			Status(metav1.ConditionFalse).
+			Status(metav1.ConditionTrue).
 			Reason(vdcondition.InProgress).
 			Message(pvcResizing.Message)
 		return reconcile.Result{}, nil
@@ -155,7 +155,7 @@ func (h ResizingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (re
 
 		vd.Status.Phase = virtv2.DiskResizing
 		cb.
-			Status(metav1.ConditionFalse).
+			Status(metav1.ConditionTrue).
 			Reason(vdcondition.InProgress).
 			Message("The virtual disk resizing has started.")
 		return reconcile.Result{}, nil
@@ -165,7 +165,7 @@ func (h ResizingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (re
 	switch condition.Reason {
 	case vdcondition.InProgress.String(), vdcondition.Resized.String():
 		cb.
-			Status(metav1.ConditionTrue).
+			Status(metav1.ConditionFalse).
 			Reason(vdcondition.Resized).
 			Message("")
 	default:

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/resizing_test.go b/images/virtualization-artifact/pkg/controller/vd/internal/resizing_test.go
@@ -104,8 +104,8 @@ var _ = Describe("Resizing handler Run", func() {
 
 		_, err := h.Handle(testContext(), vd)
 		Expect(err).To(BeNil())
-		resized, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
-		Expect(resized.Status).To(Equal(metav1.ConditionFalse))
+		resized, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
+		Expect(resized.Status).To(Equal(metav1.ConditionTrue))
 		Expect(resized.Reason).To(Equal(vdcondition.InProgress.String()))
 	})
 
@@ -116,7 +116,7 @@ var _ = Describe("Resizing handler Run", func() {
 
 		_, err := h.Handle(testContext(), vd)
 		Expect(err).To(BeNil())
-		resized, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
+		resized, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
 		Expect(resized.Status).To(Equal(metav1.ConditionFalse))
 		Expect(resized.Reason).To(Equal(vdcondition.ResizingNotRequested.String()))
 	})
@@ -128,7 +128,7 @@ var _ = Describe("Resizing handler Run", func() {
 
 		_, err := h.Handle(testContext(), vd)
 		Expect(err).To(BeNil())
-		resized, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
+		resized, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
 		Expect(resized.Status).To(Equal(metav1.ConditionFalse))
 		Expect(resized.Reason).To(Equal(vdcondition.ResizingNotRequested.String()))
 	})
@@ -138,7 +138,7 @@ var _ = Describe("Resizing handler Run", func() {
 
 		_, err := h.Handle(testContext(), vd)
 		Expect(err).To(BeNil())
-		resized, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
+		resized, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
 		Expect(resized.Status).To(Equal(metav1.ConditionFalse))
 		Expect(resized.Reason).To(Equal(vdcondition.ResizingNotRequested.String()))
 	})
@@ -150,14 +150,14 @@ var _ = Describe("Resizing handler Run", func() {
 
 		_, err := h.Handle(testContext(), vd)
 		Expect(err).To(BeNil())
-		resized, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
-		Expect(resized.Status).To(Equal(metav1.ConditionFalse))
+		resized, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
+		Expect(resized.Status).To(Equal(metav1.ConditionTrue))
 		Expect(resized.Reason).To(Equal(vdcondition.InProgress.String()))
 	})
 
 	It("Resize has completed", func() {
 		vd.Status.Conditions = append(vd.Status.Conditions, metav1.Condition{
-			Type:   vdcondition.ResizedType.String(),
+			Type:   vdcondition.ResizingType.String(),
 			Status: metav1.ConditionFalse,
 			Reason: vdcondition.InProgress.String(),
 		})
@@ -166,8 +166,8 @@ var _ = Describe("Resizing handler Run", func() {
 
 		_, err := h.Handle(testContext(), vd)
 		Expect(err).To(BeNil())
-		resized, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
-		Expect(resized.Status).To(Equal(metav1.ConditionTrue))
+		resized, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
+		Expect(resized.Status).To(Equal(metav1.ConditionFalse))
 		Expect(resized.Reason).To(Equal(vdcondition.Resized.String()))
 	})
 })

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/snapshotting.go b/images/virtualization-artifact/pkg/controller/vd/internal/snapshotting.go
@@ -74,7 +74,7 @@ func (h SnapshottingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk)
 			continue
 		}
 
-		resized, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
+		resized, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
 		if resized.Reason == vdcondition.InProgress.String() {
 			cb.
 				Status(metav1.ConditionFalse).

diff --git a/images/virtualization-artifact/pkg/controller/vmsnapshot/internal/life_cycle.go b/images/virtualization-artifact/pkg/controller/vmsnapshot/internal/life_cycle.go
@@ -462,7 +462,7 @@ func (h LifeCycleHandler) ensureBlockDeviceConsistency(ctx context.Context, vm *
 			return fmt.Errorf("%w: waiting for the Ready condition of the virtual disk %q to be True", ErrVirtualDiskResizing, vd.Name)
 		}
 
-		resizingReady, _ := conditions.GetCondition(vdcondition.ResizedType, vd.Status.Conditions)
+		resizingReady, _ := conditions.GetCondition(vdcondition.ResizingType, vd.Status.Conditions)
 		if resizingReady.Reason == vdcondition.InProgress.String() {
 			return fmt.Errorf("%w: waiting for the virtual disk %q to be resized", ErrVirtualDiskResizing, vd.Name)
 		}

diff --git a/images/virtualization-artifact/pkg/controller/vmsnapshot/internal/life_cycle_test.go b/images/virtualization-artifact/pkg/controller/vmsnapshot/internal/life_cycle_test.go
@@ -53,7 +53,7 @@ var _ = Describe("LifeCycle handler", func() {
 						Status: metav1.ConditionTrue,
 					},
 					{
-						Type:   vdcondition.Resized.String(),
+						Type:   vdcondition.ResizingType.String(),
 						Status: metav1.ConditionTrue,
 						Reason: vdcondition.Resized.String(),
 					},
@@ -198,7 +198,7 @@ var _ = Describe("LifeCycle handler", func() {
 
 		It("The virtual disk is the process of Resizing", func() {
 			snapshotter.GetVirtualDiskFunc = func(_ context.Context, _, _ string) (*virtv2.VirtualDisk, error) {
-				cb := conditions.NewConditionBuilder(vdcondition.Resized).
+				cb := conditions.NewConditionBuilder(vdcondition.ResizingType).
 					Generation(vd.Generation).
 					Status(metav1.ConditionFalse).
 					Reason(vdcondition.InProgress)

diff --git a/images/virtualization-artifact/pkg/controller/vmsnapshot/internal/watcher/vd_watcher.go b/images/virtualization-artifact/pkg/controller/vmsnapshot/internal/watcher/vd_watcher.go
@@ -105,8 +105,8 @@ func (w VirtualDiskWatcher) filterUpdateEvents(e event.UpdateEvent) bool {
 		return false
 	}
 
-	oldResized, _ := conditions.GetCondition(vdcondition.ResizedType, oldVD.Status.Conditions)
-	newResized, _ := conditions.GetCondition(vdcondition.ResizedType, newVD.Status.Conditions)
+	oldResized, _ := conditions.GetCondition(vdcondition.ResizingType, oldVD.Status.Conditions)
+	newResized, _ := conditions.GetCondition(vdcondition.ResizingType, newVD.Status.Conditions)
 
 	return oldResized.Status != newResized.Status || oldResized.Reason != newResized.Reason
 }