sc

Signed-off-by: Valeriy Khorunzhin <[email protected]>
deckhouse · Nov 14, 2024 · 4282322 · 4282322
1 parent 077ff0a
commit 4282322
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 60 deletions.
diff --git a/api/core/v1alpha2/vdcondition/condition.go b/api/core/v1alpha2/vdcondition/condition.go
@@ -65,6 +65,10 @@ func (s SnapshottingReason) String() string {
 	return string(s)
 }
 
+func (s StorageClassReadyReason) String() string {
+	return string(s)
+}
+
 const (
 	// DatasourceReady indicates that the datasource is ready for use, allowing the import process to start.
 	DatasourceReady DatasourceReadyReason = "DatasourceReady"

diff --git a/images/virtualization-artifact/pkg/controller/service/condition.go b/images/virtualization-artifact/pkg/controller/service/condition.go
@@ -20,26 +20,10 @@ import (
 	"unicode"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	virtv1 "kubevirt.io/api/core/v1"
 	cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 )
 
-func GetCondition(condType string, conds []metav1.Condition) (metav1.Condition, bool) {
-	for _, cond := range conds {
-		if cond.Type == condType {
-			return cond, true
-		}
-	}
-
-	return metav1.Condition{}, false
-}
-
-func SetCondition(cond metav1.Condition, conditions *[]metav1.Condition) {
-	meta.SetStatusCondition(conditions, cond)
-}
-
 func CapitalizeFirstLetter(s string) string {
 	if s == "" {
 		return ""

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go b/images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go
@@ -97,16 +97,20 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (r
 		return reconcile.Result{Requeue: true}, nil
 	}
 
-	storageClassReadyCondition, ok := service.GetCondition(vdcondition.StorageClassReadyType, vd.Status.Conditions)
+	storageClassReadyCondition, ok := conditions.GetCondition(vdcondition.StorageClassReadyType, vd.Status.Conditions)
 	if !ok {
 		return reconcile.Result{Requeue: true}, fmt.Errorf("condition %s not found", vdcondition.StorageClassReadyType)
 	}
 
 	if readyCondition.Status != metav1.ConditionTrue && storageClassReadyCondition.Status != metav1.ConditionTrue {
-		readyCondition.Status = metav1.ConditionFalse
-		readyCondition.Reason = vdcondition.StorageClassNotReady
-		readyCondition.Message = "Storage class is not ready, please read the StorageClassReady condition state."
-		service.SetCondition(readyCondition, &vd.Status.Conditions)
+		readyCB := conditions.
+			NewConditionBuilder(vdcondition.ReadyType).
+			Generation(vd.Generation).
+			Status(metav1.ConditionFalse).
+			Reason(vdcondition.StorageClassNotReady).
+			Message("Storage class is not ready, please read the StorageClassReady condition state.")
+
+		conditions.SetCondition(readyCB, &vd.Status.Conditions)
 	}
 
 	if readyCondition.Status != metav1.ConditionTrue && storageClassReadyCondition.Status != metav1.ConditionTrue && vd.Status.StorageClassName != "" {

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/life_cycle_test.go b/images/virtualization-artifact/pkg/controller/vd/internal/life_cycle_test.go
@@ -37,19 +37,19 @@ var _ = Describe("LifeCycleHandler Run", func() {
 		"Check on LifeCycle.Cleanup after spec changes",
 		func(args cleanupAfterSpecChangeTestArgs) {
 			var sourcesMock SourcesMock
-			args.ReadyCondition.Type = vdcondition.ReadyType
+			args.ReadyCondition.Type = vdcondition.ReadyType.String()
 			cleanUpCalled := false
 			vd := virtv2.VirtualDisk{
 				Status: virtv2.VirtualDiskStatus{
 					StorageClassName: "",
 					Conditions: []metav1.Condition{
 						args.ReadyCondition,
 						{
-							Type:   vdcondition.DatasourceReadyType,
+							Type:   vdcondition.DatasourceReadyType.String(),
 							Status: metav1.ConditionTrue,
 						},
 						{
-							Type:   vdcondition.StorageClassReadyType,
+							Type:   vdcondition.StorageClassReadyType.String(),
 							Status: metav1.ConditionTrue,
 						},
 					},
@@ -115,7 +115,7 @@ var _ = Describe("LifeCycleHandler Run", func() {
 			cleanupAfterSpecChangeTestArgs{
 				ReadyCondition: metav1.Condition{
 					Status: metav1.ConditionTrue,
-					Reason: vdcondition.Ready,
+					Reason: vdcondition.Ready.String(),
 				},
 				SpecChanged:   true,
 				ExpectCleanup: false,
@@ -126,7 +126,7 @@ var _ = Describe("LifeCycleHandler Run", func() {
 			cleanupAfterSpecChangeTestArgs{
 				ReadyCondition: metav1.Condition{
 					Status: metav1.ConditionUnknown,
-					Reason: vdcondition.Lost,
+					Reason: vdcondition.Lost.String(),
 				},
 				SpecChanged:   true,
 				ExpectCleanup: false,
@@ -137,8 +137,8 @@ var _ = Describe("LifeCycleHandler Run", func() {
 	DescribeTable(
 		"Verification that LifeCycle.CleanUp is called after the StorageClassReady status becomes false",
 		func(args cleanupAfterScNotReadyTestArgs) {
-			args.ReadyCondition.Type = vdcondition.ReadyType
-			args.StorageClassReadyCondition.Type = vdcondition.StorageClassReadyType
+			args.ReadyCondition.Type = vdcondition.ReadyType.String()
+			args.StorageClassReadyCondition.Type = vdcondition.StorageClassReadyType.String()
 			var sourcesMock SourcesMock
 			cleanUpCalled := false
 			vd := virtv2.VirtualDisk{
@@ -148,7 +148,7 @@ var _ = Describe("LifeCycleHandler Run", func() {
 						args.ReadyCondition,
 						args.StorageClassReadyCondition,
 						{
-							Type:   vdcondition.DatasourceReadyType,
+							Type:   vdcondition.DatasourceReadyType.String(),
 							Status: metav1.ConditionTrue,
 						},
 					},

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/storageclass_ready.go b/images/virtualization-artifact/pkg/controller/vd/internal/storageclass_ready.go
@@ -43,21 +43,15 @@ func NewStorageClassReadyHandler(diskService DiskService) *StorageClassReadyHand
 }
 
 func (h StorageClassReadyHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (reconcile.Result, error) {
-	condition, ok := service.GetCondition(vdcondition.StorageClassReadyType, vd.Status.Conditions)
-	if !ok {
-		condition = metav1.Condition{
-			Type:   vdcondition.StorageClassReadyType,
-			Status: metav1.ConditionUnknown,
-			Reason: conditions.ReasonUnknown.String(),
-		}
-	}
+	cb := conditions.NewConditionBuilder(vdcondition.StorageClassReadyType).Generation(vd.Generation)
 
-	defer func() { service.SetCondition(condition, &vd.Status.Conditions) }()
+	defer func() { conditions.SetCondition(cb, &vd.Status.Conditions) }()
 
 	if vd.DeletionTimestamp != nil {
-		condition.Status = metav1.ConditionUnknown
-		condition.Reason = conditions.ReasonUnknown.String()
-		condition.Message = ""
+		cb.
+			Status(metav1.ConditionUnknown).
+			Reason(conditions.ReasonUnknown).
+			Message("")
 		return reconcile.Result{}, nil
 	}
 
@@ -95,17 +89,20 @@ func (h StorageClassReadyHandler) Handle(ctx context.Context, vd *virtv2.Virtual
 
 	switch {
 	case sc != nil:
-		condition.Status = metav1.ConditionTrue
-		condition.Reason = vdcondition.StorageClassReady
-		condition.Message = ""
+		cb.
+			Status(metav1.ConditionTrue).
+			Reason(vdcondition.StorageClassReady).
+			Message("")
 	case hasNoStorageClassInSpec:
-		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.StorageClassNotFound
-		condition.Message = "The default storage class was not found in cluster. Please specify the storage class name in the virtual disk specification."
+		cb.
+			Status(metav1.ConditionFalse).
+			Reason(vdcondition.StorageClassNotFound).
+			Message("The default storage class was not found in cluster. Please specify the storage class name in the virtual disk specification.")
 	default:
-		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.StorageClassNotFound
-		condition.Message = fmt.Sprintf("Storage class %q not found", *vd.Spec.PersistentVolumeClaim.StorageClass)
+		cb.
+			Status(metav1.ConditionFalse).
+			Reason(vdcondition.StorageClassNotFound).
+			Message(fmt.Sprintf("Storage class %q not found", *vd.Spec.PersistentVolumeClaim.StorageClass))
 	}
 
 	return reconcile.Result{}, nil

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/storageclass_ready_test.go b/images/virtualization-artifact/pkg/controller/vd/internal/storageclass_ready_test.go
@@ -26,7 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 
-	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
+	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/supplements"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
@@ -39,7 +39,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 			_, err := handler.Handle(context.TODO(), args.VirtualDisk)
 
 			Expect(err).To(BeNil())
-			condition, ok := service.GetCondition(vdcondition.StorageClassReadyType, args.VirtualDisk.Status.Conditions)
+			condition, ok := conditions.GetCondition(vdcondition.StorageClassReadyType, args.VirtualDisk.Status.Conditions)
 			Expect(ok).To(BeTrue())
 			Expect(condition.Status).To(Equal(args.ExpectedCondition.Status))
 			Expect(condition.Reason).To(Equal(args.ExpectedCondition.Reason))
@@ -53,7 +53,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 				StorageClassInExistedPVC:     nil,
 				ExpectedCondition: metav1.Condition{
 					Status: metav1.ConditionFalse,
-					Reason: vdcondition.StorageClassNotFound,
+					Reason: vdcondition.StorageClassNotFound.String(),
 				},
 				ExpectedStorageClassInStatus: "",
 			},
@@ -66,7 +66,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 				StorageClassInExistedPVC:     ptr.To("sc"),
 				ExpectedCondition: metav1.Condition{
 					Status: metav1.ConditionTrue,
-					Reason: vdcondition.StorageClassReady,
+					Reason: vdcondition.StorageClassReady.String(),
 				},
 				ExpectedStorageClassInStatus: "sc",
 			},
@@ -79,7 +79,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 				StorageClassInExistedPVC:     nil,
 				ExpectedCondition: metav1.Condition{
 					Status: metav1.ConditionTrue,
-					Reason: vdcondition.StorageClassReady,
+					Reason: vdcondition.StorageClassReady.String(),
 				},
 				ExpectedStorageClassInStatus: "sc",
 			},
@@ -92,7 +92,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 				StorageClassInExistedPVC:     nil,
 				ExpectedCondition: metav1.Condition{
 					Status: metav1.ConditionTrue,
-					Reason: vdcondition.StorageClassReady,
+					Reason: vdcondition.StorageClassReady.String(),
 				},
 				ExpectedStorageClassInStatus: "sc",
 			},
@@ -105,7 +105,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 				StorageClassInExistedPVC:     nil,
 				ExpectedCondition: metav1.Condition{
 					Status: metav1.ConditionFalse,
-					Reason: vdcondition.StorageClassNotFound,
+					Reason: vdcondition.StorageClassNotFound.String(),
 				},
 				ExpectedStorageClassInStatus: "statusSC",
 			},
@@ -118,7 +118,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 				StorageClassInExistedPVC:     ptr.To("pvcSC"),
 				ExpectedCondition: metav1.Condition{
 					Status: metav1.ConditionTrue,
-					Reason: vdcondition.StorageClassReady,
+					Reason: vdcondition.StorageClassReady.String(),
 				},
 				ExpectedStorageClassInStatus: "pvcSC",
 			},
@@ -131,7 +131,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 				StorageClassInExistedPVC:     ptr.To("pvcSC"),
 				ExpectedCondition: metav1.Condition{
 					Status: metav1.ConditionTrue,
-					Reason: vdcondition.StorageClassReady,
+					Reason: vdcondition.StorageClassReady.String(),
 				},
 				ExpectedStorageClassInStatus: "pvcSC",
 			},
@@ -144,7 +144,7 @@ var _ = Describe("StorageClassHandler Run", func() {
 				StorageClassInExistedPVC:     nil,
 				ExpectedCondition: metav1.Condition{
 					Status: metav1.ConditionTrue,
-					Reason: vdcondition.StorageClassReady,
+					Reason: vdcondition.StorageClassReady.String(),
 				},
 				ExpectedStorageClassInStatus: "specSC",
 			},