simplify keeper version conditions

Author: GrigoryPervakov

internal/controller/keeper/sync.go

@@ -7,7 +7,6 @@ import (
 	"math"
 	"slices"
 	"strconv"
-	"strings"
 	"time"
 
 	"gopkg.in/yaml.v2"
@@ -596,9 +595,7 @@ func (r *keeperReconciler) evaluateReplicaConditions() {
 	r.SetCondition(chctrl.ReplicaStartupCondition(errorIDs))
 	r.SetCondition(chctrl.HealthyCondition(notReadyIDs))
 	r.SetCondition(chctrl.ConfigSyncCondition(nil, notUpdatedIDs, nil))
-	versionCond, versionEvents := keeperVersionSyncCondition(replicaVersions, len(notUpdatedIDs) > 0)
-	r.SetCondition(versionCond, versionEvents...)
-	r.evaluateUpgradeCondition(replicaVersions)
+	r.evaluateVersionConditions(len(notUpdatedIDs) > 0)
 
 	// Ready condition — keeper-specific logic.
 	exists := len(r.ReplicaState)
@@ -677,75 +674,38 @@ func (r *keeperReconciler) evaluateReplicaConditions() {
 	)
 }
 
-func (r *keeperReconciler) evaluateUpgradeCondition(replicaVersions map[string]string) {
-	version, ok := keeperObservedVersion(replicaVersions)
-	if ok {
-		r.Cluster.Status.Version = version
-	}
-
-	if r.Checker == nil || !ok {
-		meta.RemoveStatusCondition(r.Cluster.GetStatus().GetConditions(), v1.ConditionTypeVersionUpgraded)
-		return
-	}
+func (r *keeperReconciler) evaluateVersionConditions(isUpdating bool) {
+	versionByReplica := map[string]string{}
+	countByVersion := map[string]int{}
+	commonVersion := ""
 
-	cond, event := chctrl.GetUpgradeCondition(*r.Checker, chctrl.VersionProbeResult{Version: version}, r.Cluster.Spec.UpgradeChannel)
-	r.SetCondition(cond, event...)
-}
-
-func keeperVersionSyncCondition(replicaVersions map[string]string, isUpdating bool) (metav1.Condition, []chctrl.EventSpec) {
-	newCond := func(status metav1.ConditionStatus, reason v1.ConditionReason, message string) metav1.Condition {
-		return metav1.Condition{
-			Type:    v1.ConditionTypeVersionInSync,
-			Status:  status,
-			Reason:  reason,
-			Message: message,
+	for i, s := range r.ReplicaState {
+		if s.Status.Version != "" {
+			versionByReplica[strconv.FormatInt(int64(i), 10)] = s.Status.Version
+			countByVersion[s.Status.Version]++
+			commonVersion = s.Status.Version
 		}
 	}
 
-	if len(replicaVersions) == 0 {
-		return newCond(metav1.ConditionUnknown, v1.ConditionReasonVersionPending, "No Keeper replica version has been observed yet"), nil
-	}
-
-	var observed []string
-	for id, version := range replicaVersions {
-		observed = append(observed, fmt.Sprintf("%s: %s", id, version))
+	// Record the version only when all observed replicas agree, otherwise keep the last known one.
+	if len(countByVersion) == 1 {
+		r.Cluster.Status.Version = commonVersion
 	}
 
-	if version, ok := keeperObservedVersion(replicaVersions); ok {
-		return newCond(metav1.ConditionTrue, v1.ConditionReasonVersionMatch,
-			"All observed Keeper replicas report version "+version), nil
+	probe := chctrl.VersionProbeResult{
+		Version: r.Cluster.Status.Version,
+		Pending: len(versionByReplica) == 0,
 	}
 
-	slices.Sort(observed)
-	cond := newCond(metav1.ConditionFalse, v1.ConditionReasonVersionMismatch,
-		"Keeper replica versions differ: "+strings.Join(observed, ", "))
-
-	if isUpdating {
-		return cond, nil
-	}
-
-	return cond, []chctrl.EventSpec{{
-		Type:    corev1.EventTypeWarning,
-		Reason:  v1.EventReasonVersionDiverge,
-		Action:  v1.EventActionVersionCheck,
-		Message: cond.Message,
-	}}
-}
-
-func keeperObservedVersion(replicaVersions map[string]string) (string, bool) {
-	var result string
-	for _, version := range replicaVersions {
-		if result == "" {
-			result = version
-			continue
-		}
+	cond, event := chctrl.GetVersionSyncCondition(probe, versionByReplica, isUpdating)
+	r.SetCondition(cond, event...)
 
-		if version != result {
-			return "", false
-		}
+	if r.Checker != nil {
+		cond, event = chctrl.GetUpgradeCondition(*r.Checker, probe, r.Cluster.Spec.UpgradeChannel)
+		r.SetCondition(cond, event...)
+	} else {
+		meta.RemoveStatusCondition(r.Cluster.GetStatus().GetConditions(), v1.ConditionTypeVersionUpgraded)
 	}
-
-	return result, result != ""
 }
 
 func (r *keeperReconciler) updateReplica(ctx context.Context, log ctrlutil.Logger, replicaID v1.KeeperReplicaID) (*ctrl.Result, error) {

test/e2e/keeper_e2e_test.go

@@ -60,7 +60,7 @@ var _ = Describe("Keeper controller", Label("keeper"), func() {
 
 		WaitKeeperUpdatedAndReady(ctx, &cr, 3*time.Minute, true)
 		ExpectWithOffset(1, k8sClient.Get(ctx, cr.NamespacedName(), &cr)).To(Succeed())
-
+		Expect(cr.Status.Version).To(HavePrefix(cr.Spec.ContainerTemplate.Image.Tag))
 		KeeperRWChecks(ctx, &cr, &checks)
 	},
 		Entry("update log level", v1.KeeperClusterSpec{Settings: v1.KeeperSettings{