++ review comments: fix adding condition to deployment/dvcr

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

Author: diafour

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

@@ -53,22 +53,27 @@ func UpdateMaintenanceCondition(deploy *appsv1.Deployment, reason dvcrdeployment
 
 	condition := NewMaintenanceCondition(reason, msgf, args...)
 
-	// Condition is nil, so remove maintenance condition.
-	if len(deploy.Status.Conditions) > 0 {
-		filteredConditions := make([]appsv1.DeploymentCondition, 0)
-		for _, cond := range deploy.Status.Conditions {
-			if cond.Type == dvcrdeploymentcondition.MaintenanceType {
-				if cond.Reason != condition.Reason || cond.Message != condition.Message {
-					condition.LastTransitionTime = metav1.Now()
-				}
-				cond = condition
+	// Deploy has no conditions, create new slice.
+	if len(deploy.Status.Conditions) == 0 {
+		deploy.Status.Conditions = []appsv1.DeploymentCondition{condition}
+	}
+
+	// Add or update existing condition.
+	filteredConditions := make([]appsv1.DeploymentCondition, 0)
+	existed := false
+	for _, cond := range deploy.Status.Conditions {
+		if cond.Type == dvcrdeploymentcondition.MaintenanceType {
+			if cond.Reason != condition.Reason || cond.Message != condition.Message {
+				condition.LastTransitionTime = metav1.Now()
 			}
-			// Copy non-maintenance conditions.
-			filteredConditions = append(filteredConditions, cond)
+			cond = condition
+			existed = true
 		}
-		deploy.Status.Conditions = filteredConditions
+		// Copy non-maintenance conditions.
+		filteredConditions = append(filteredConditions, cond)
 	}
-
-	// Deploy has no conditions, create new slice.
-	deploy.Status.Conditions = []appsv1.DeploymentCondition{condition}
+	if !existed {
+		filteredConditions = append(filteredConditions, condition)
+	}
+	deploy.Status.Conditions = filteredConditions
 }

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

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
@@ -118,7 +119,7 @@ func (p *ProvisioningLister) ListVirtualDisksInProvisioning(ctx context.Context)
 			continue
 		}
 		cond, exists := conditions.GetCondition(vdcondition.ReadyType, vd.Status.Conditions)
-		if exists && cond.Status == "False" && cond.Reason == vdcondition.Provisioning.String() {
+		if exists && cond.Status == metav1.ConditionFalse && cond.Reason == vdcondition.Provisioning.String() {
 			provisioning = append(provisioning, vd)
 		}
 	}

images/virtualization-artifact/pkg/controller/dvcr-maintenance/types/interfaces.go

@@ -29,7 +29,6 @@ type DVCRService interface {
 	InitiateMaintenanceMode(ctx context.Context) error
 	SwitchToMaintenanceMode(ctx context.Context) error
 
-	IsMaintenanceInitiatedNotStarted(secret *corev1.Secret) bool
 	IsMaintenanceStarted(secret *corev1.Secret) bool
 	IsMaintenanceDone(secret *corev1.Secret) bool
 }

images/virtualization-artifact/pkg/controller/service/dvcr_service.go

@@ -41,7 +41,6 @@ func NewDVCRService(client client.Client) *DVCRService {
 
 const (
 	moduleNamespace           = "d8-virtualization"
-	dvcrDeploymentName        = "dvcr"
 	maintenanceModeSecretName = "dvcr-maintenance"
 )
 
@@ -65,18 +64,6 @@ func (d *DVCRService) IsMaintenanceSecretExist(ctx context.Context) (bool, error
 	return secret != nil, err
 }
 
-// IsMaintenanceInitiatedNotStarted returns true if secret exists but
-// cleanup is not done yet.
-// Use it to postpone switch deployment to maintenance until all write operations are finished.
-func (d *DVCRService) IsMaintenanceInitiatedNotStarted(secret *corev1.Secret) bool {
-	if secret == nil {
-		return false
-	}
-	_, switched := secret.GetAnnotations()[annotations.AnnDVCRDeploymentSwitchToMaintenanceMode]
-	_, done := secret.GetAnnotations()[annotations.AnnDVCRGarbageCollectionDone]
-	return !switched && !done
-}
-
 // IsMaintenanceStarted returns true if switch to maintenance mode is on.
 // Use it to determine "wait" state.
 func (d *DVCRService) IsMaintenanceStarted(secret *corev1.Secret) bool {