++ review comments

Signed-off-by: Ivan Mikheykin <[email protected]>

Author: diafour

api/core/v1alpha2/dvcr-deployment-condition/condition.go

@@ -21,8 +21,6 @@ import appsv1 "k8s.io/api/apps/v1"
 const (
 	// MaintenanceType indicates whether the deployment/dvcr is in maintenance mode.
 	MaintenanceType appsv1.DeploymentConditionType = "Maintenance"
-
-	// LastMaintenanceResultType Type = "LastMaintenanceResult"
 )
 
 type (
@@ -38,6 +36,6 @@ const (
 	// InProgress indicates that the maintenance is in progress: wait for provisioners, or deployment is modified to run garbage collection.  (status true)
 	InProgress MaintenanceReason = "GarbageCollectionInProgress"
 
-	// LastResult indicates that the maintenance is done and result is in the message. (status false)
-	LastResult MaintenanceReason = "LastResult"
+	// Done indicates that the maintenance is done and result is in the message. (status false)
+	Done MaintenanceReason = "GarbageCollectionDone"
 )

images/virtualization-artifact/pkg/common/annotations/annotations.go

@@ -188,8 +188,10 @@ const (
 	// AnnVMOPSnapshotName is an annotation on vmop that represents name a snapshot created for VMOP.
 	AnnVMOPSnapshotName = AnnAPIGroupV + "/vmop-snapshot-name"
 
+	// AnnDVCRDeploymentSwitchToMaintenanceMode is an annotation on maintenance secret that indicates deployment/dcvr may be switched to maintenance mode.
 	AnnDVCRDeploymentSwitchToMaintenanceMode = AnnAPIGroupV + "/dvcr-deployment-switch-to-maintenance-mode"
-	AnnDVCRGarbageCollectionDone             = AnnAPIGroupV + "/dvcr-garbage-collection-done"
+	// AnnDVCRGarbageCollectionDone is an annotation on maintenance secret that indicates the garbage collection process is done.
+	AnnDVCRGarbageCollectionDone = AnnAPIGroupV + "/dvcr-garbage-collection-done"
 )
 
 // AddAnnotation adds an annotation to an object

images/virtualization-artifact/pkg/controller/dvcr-maintenance/condition/deployment.go

@@ -23,20 +23,20 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	dvcr_deployment_condition "github.com/deckhouse/virtualization/api/core/v1alpha2/dvcr-deployment-condition"
+	dvcrdeploymentcondition "github.com/deckhouse/virtualization/api/core/v1alpha2/dvcr-deployment-condition"
 )
 
-func NewMaintenanceCondition(reason dvcr_deployment_condition.MaintenanceReason, msgf string, args ...any) appsv1.DeploymentCondition {
+func NewMaintenanceCondition(reason dvcrdeploymentcondition.MaintenanceReason, msgf string, args ...any) appsv1.DeploymentCondition {
 	status := "Unknown"
 	switch reason {
-	case dvcr_deployment_condition.LastResult:
+	case dvcrdeploymentcondition.Done:
 		status = "False"
-	case dvcr_deployment_condition.InProgress:
+	case dvcrdeploymentcondition.InProgress:
 		status = "True"
 	}
 
 	return appsv1.DeploymentCondition{
-		Type:           dvcr_deployment_condition.MaintenanceType,
+		Type:           dvcrdeploymentcondition.MaintenanceType,
 		Status:         corev1.ConditionStatus(status),
 		LastUpdateTime: metav1.Now(),
 		Reason:         string(reason),
@@ -46,7 +46,7 @@ func NewMaintenanceCondition(reason dvcr_deployment_condition.MaintenanceReason,
 
 // UpdateMaintenanceCondition replaces or removes Maintenance condition from deployment status.
 // Return true if status was changed.
-func UpdateMaintenanceCondition(deploy *appsv1.Deployment, reason dvcr_deployment_condition.MaintenanceReason, msgf string, args ...any) {
+func UpdateMaintenanceCondition(deploy *appsv1.Deployment, reason dvcrdeploymentcondition.MaintenanceReason, msgf string, args ...any) {
 	if deploy == nil {
 		return
 	}
@@ -57,7 +57,7 @@ func UpdateMaintenanceCondition(deploy *appsv1.Deployment, reason dvcr_deploymen
 	if len(deploy.Status.Conditions) > 0 {
 		filteredConditions := make([]appsv1.DeploymentCondition, 0)
 		for _, cond := range deploy.Status.Conditions {
-			if cond.Type == dvcr_deployment_condition.MaintenanceType {
+			if cond.Type == dvcrdeploymentcondition.MaintenanceType {
 				if cond.Reason != condition.Reason || cond.Message != condition.Message {
 					condition.LastTransitionTime = metav1.Now()
 				}
@@ -72,20 +72,3 @@ func UpdateMaintenanceCondition(deploy *appsv1.Deployment, reason dvcr_deploymen
 	// Deploy has no conditions, create new slice.
 	deploy.Status.Conditions = []appsv1.DeploymentCondition{condition}
 }
-
-// DeleteMaintenanceCondition removes Maintenance condition from deployment status.
-func DeleteMaintenanceCondition(deploy *appsv1.Deployment) {
-	if deploy == nil || len(deploy.Status.Conditions) == 0 {
-		return
-	}
-
-	// Filter conditions to remove maintenance condition.
-	filteredConditions := make([]appsv1.DeploymentCondition, 0)
-	for _, cond := range deploy.Status.Conditions {
-		if cond.Type != dvcr_deployment_condition.MaintenanceType {
-			// Copy only non-maintenance conditions.
-			filteredConditions = append(filteredConditions, cond)
-		}
-	}
-	deploy.Status.Conditions = filteredConditions
-}

images/virtualization-artifact/pkg/controller/dvcr-maintenance/internal/life_cycle.go

@@ -48,7 +48,7 @@ func (h LifeCycleHandler) Handle(ctx context.Context, req reconcile.Request, dep
 	if req.Namespace == dvcrtypes.CronSourceNamespace && req.Name == dvcrtypes.CronSourceRunGC {
 		dvcrcondition.UpdateMaintenanceCondition(deploy,
 			dvcr_deployment_condition.InProgress,
-			"garbage collection initiated",
+			"Garbage collection initiated.",
 		)
 		return reconcile.Result{}, h.dvcrService.InitiateMaintenanceMode(ctx)
 	}
@@ -75,7 +75,7 @@ func (h LifeCycleHandler) Handle(ctx context.Context, req reconcile.Request, dep
 
 		if h.dvcrService.IsMaintenanceDone(secret) {
 			dvcrcondition.UpdateMaintenanceCondition(deploy,
-				dvcr_deployment_condition.LastResult,
+				dvcr_deployment_condition.Done,
 				"%s", string(secret.Data["result"]),
 			)
 			return reconcile.Result{}, h.dvcrService.DeleteMaintenanceSecret(ctx)
@@ -84,7 +84,7 @@ func (h LifeCycleHandler) Handle(ctx context.Context, req reconcile.Request, dep
 		if h.dvcrService.IsMaintenanceStarted(secret) {
 			dvcrcondition.UpdateMaintenanceCondition(deploy,
 				dvcr_deployment_condition.InProgress,
-				"wait for garbage collection to finish",
+				"Wait for garbage collection to finish.",
 			)
 			// Wait for done annotation.
 			return reconcile.Result{}, nil
@@ -99,7 +99,7 @@ func (h LifeCycleHandler) Handle(ctx context.Context, req reconcile.Request, dep
 		if remainInProvisioning > 0 {
 			dvcrcondition.UpdateMaintenanceCondition(deploy,
 				dvcr_deployment_condition.InProgress,
-				"wait for cvi/vi/vd finish provisioning: %d resources remain", remainInProvisioning,
+				"Wait for cvi/vi/vd finish provisioning: %d resources remain.", remainInProvisioning,
 			)
 			return reconcile.Result{RequeueAfter: time.Second * 20}, nil
 		}
@@ -110,7 +110,7 @@ func (h LifeCycleHandler) Handle(ctx context.Context, req reconcile.Request, dep
 		}
 		dvcrcondition.UpdateMaintenanceCondition(deploy,
 			dvcr_deployment_condition.InProgress,
-			"wait for garbage collection to finish",
+			"Wait for garbage collection to finish.",
 		)
 		return reconcile.Result{}, nil
 	}