Merge pull request #1023 from openshift-cherrypick-robot/cherry-pick-…

…1011-to-release-4.15

[release-4.15] OCPBUGS-27359: CO health: only track current in-progress upgrade start

pkg/cvo/internal/operatorstatus.go

@@ -99,7 +99,7 @@ func (b *clusterOperatorBuilder) Do(ctx context.Context) error {
 	co := readClusterOperatorV1OrDie(b.raw)
 
 	// add cluster operator's start time if not already there
-	payload.COUpdateStartTimesEnsureName(co.Name)
+	payload.COUpdateStartTimesEnsure(co.Name)
 
 	if b.modifier != nil {
 		b.modifier(co)
@@ -144,7 +144,14 @@ func (b *clusterOperatorBuilder) Do(ctx context.Context) error {
 		}
 	}
 
-	return checkOperatorHealth(ctx, b.client, co, b.mode)
+	err := checkOperatorHealth(ctx, b.client, co, b.mode)
+	if err == nil {
+		// Operator is updated to desired version and healthy. These times are now only used to compute
+		// the "waiting 40 minutes" message, so once we succeed, keeping time when we *first* started
+		// to upgrade this CO makes no sense. We need to track when the current ongoing upgrade started.
+		payload.COUpdateStartTimesRemove(co.Name)
+	}
+	return err
 }
 
 func checkOperatorHealth(ctx context.Context, client ClusterOperatorsGetter, expected *configv1.ClusterOperator, mode resourcebuilder.Mode) error {

pkg/payload/task.go

@@ -44,16 +44,23 @@ func InitCOUpdateStartTimes() {
 	clusterOperatorUpdateStartTimes.lock.Unlock()
 }
 
-// COUpdateStartTimesEnsureName adds name to clusterOperatorUpdateStartTimes map and sets to
+// COUpdateStartTimesEnsure adds name to clusterOperatorUpdateStartTimes map and sets to
 // current time if name does not already exist in map.
-func COUpdateStartTimesEnsureName(name string) {
+func COUpdateStartTimesEnsure(name string) {
 	clusterOperatorUpdateStartTimes.lock.Lock()
 	if _, ok := clusterOperatorUpdateStartTimes.m[name]; !ok {
 		clusterOperatorUpdateStartTimes.m[name] = time.Now()
 	}
 	clusterOperatorUpdateStartTimes.lock.Unlock()
 }
 
+// COUpdateStartTimesRemove removes name from clusterOperatorUpdateStartTimes
+func COUpdateStartTimesRemove(name string) {
+	clusterOperatorUpdateStartTimes.lock.Lock()
+	delete(clusterOperatorUpdateStartTimes.m, name)
+	clusterOperatorUpdateStartTimes.lock.Unlock()
+}
+
 // COUpdateStartTimesGet returns name's value from clusterOperatorUpdateStartTimes map.
 func COUpdateStartTimesGet(name string) time.Time {
 	clusterOperatorUpdateStartTimes.lock.Lock()