test only changes

Author: jottofar

pkg/cvo/internal/operatorstatus.go

@@ -206,14 +206,18 @@ func waitForOperatorStatusToBeDone(ctx context.Context, interval time.Duration,
 		case resourcebuilder.InitializingMode:
 			// during initialization we allow degraded as long as the component goes available
 			if available && (!progressing || len(expected.Status.Versions) > 0) {
-				return true, nil
+				if expected.Name != "machine-config" && expected.Name != "openshift-apiserver" {
+					return true, nil
+				}
 			}
 		default:
 			// if we're at the correct version, and available, and not degraded, we are done
 			// if we're available, not degraded, and not progressing, we're also done
 			// TODO: remove progressing once all cluster operators report expected versions
 			if available && (!progressing || len(expected.Status.Versions) > 0) && !degraded {
-				return true, nil
+				if expected.Name != "machine-config" && expected.Name != "openshift-apiserver" {
+					return true, nil
+				}
 			}
 		}
 
@@ -235,12 +239,16 @@ func waitForOperatorStatusToBeDone(ctx context.Context, interval time.Duration,
 					Message:      message,
 					Name:         actual.Name,
 				}
-				return false, nil
+				if expected.Name != "machine-config" && expected.Name != "openshift-apiserver" {
+					return false, nil
+				}
 			}
 		}
 
 		updateEffect := payload.UpdateEffectFail
-		if available {
+		if available && expected.Name == "openshift-apiserver" {
+			updateEffect = payload.UpdateEffectFailAfterInterval
+		} else if available && expected.Name != "machine-config" {
 			updateEffect = payload.UpdateEffectFailAfterInterval
 		}
 		lastErr = &payload.UpdateError{

pkg/cvo/status.go

@@ -273,6 +273,7 @@ func (optr *Operator) syncStatus(ctx context.Context, original, config *configv1
 				Message:            fmt.Sprintf("Error while reconciling %s: %s", version, msg),
 				LastTransitionTime: now,
 			})
+			klog.Infof("!!!! %s", fmt.Sprintf("Error while reconciling %s: %s", version, msg))
 		} else {
 			resourcemerge.SetOperatorStatusCondition(&config.Status.Conditions, configv1.ClusterOperatorStatusCondition{
 				Type:               configv1.OperatorProgressing,
@@ -281,6 +282,7 @@ func (optr *Operator) syncStatus(ctx context.Context, original, config *configv1
 				Message:            fmt.Sprintf("Unable to apply %s: %s", version, msg),
 				LastTransitionTime: now,
 			})
+			klog.Infof("!!!! %s", fmt.Sprintf("Unable to apply %s: %s", version, msg))
 		}
 
 	} else {
@@ -331,6 +333,7 @@ func (optr *Operator) syncStatus(ctx context.Context, original, config *configv1
 				Message:            message,
 				LastTransitionTime: now,
 			})
+			klog.Infof("!!!! %s", message)
 		}
 	}
 
@@ -357,33 +360,44 @@ func (optr *Operator) syncStatus(ctx context.Context, original, config *configv1
 // its last update to go ready, or an hour has elapsed since the update began, before the condition is ignored.
 func convertErrorToProgressing(history []configv1.UpdateHistory, now time.Time, status *SyncWorkerStatus) (reason string, message string, ok bool) {
 	if len(history) == 0 || status.Failure == nil || status.Reconciling {
+		klog.Infof("!!!! 1")
 		return "", "", false
 	}
 	uErr, ok := status.Failure.(*payload.UpdateError)
 	if !ok {
+		klog.Infof("!!!! 2")
 		return "", "", false
 	}
 	if uErr.Reason == "ClusterOperatorNotAvailable" || uErr.Reason == "ClusterOperatorsNotAvailable" {
 		switch uErr.UpdateEffect {
 		case payload.UpdateEffectNone:
+			klog.Infof("!!!! 3")
 			return uErr.Reason, fmt.Sprintf("waiting on %s", uErr.Name), true
 		case payload.UpdateEffectFail:
+			klog.Infof("!!!! 4")
 			return "", "", false
 		case payload.UpdateEffectFailAfterInterval:
 			var exceeded []string
-			threshold := now.Add(-(40 * time.Minute))
+			//threshold := now.Add(-(40 * time.Minute))
+			threshold := now.Add(-(20 * time.Minute))
 			for _, name := range strings.Split(uErr.Name, ", ") {
 				if payload.COUpdateStartTimesGet(name).Before(threshold) {
+					klog.Infof("!!!! exceeded=%s", name)
 					exceeded = append(exceeded, name)
 				}
 			}
 			if len(exceeded) > 0 {
-				return uErr.Reason, fmt.Sprintf("wait has exceeded 40 minutes for these operators: %s", strings.Join(exceeded, ", ")), false
+				klog.Infof("!!!! 5")
+				//return uErr.Reason, fmt.Sprintf("wait has exceeded 40 minutes for these operators: %s", strings.Join(exceeded, ", ")), false
+				return uErr.Reason, fmt.Sprintf("wait has exceeded 20 minutes for these operators: %s", strings.Join(exceeded, ", ")), false
 			} else {
-				return uErr.Reason, fmt.Sprintf("waiting up to 40 minutes on %s", uErr.Name), true
+				klog.Infof("!!!! 6")
+				//return uErr.Reason, fmt.Sprintf("waiting up to 40 minutes on %s", uErr.Name), true
+				return uErr.Reason, fmt.Sprintf("waiting up to 20 minutes on %s", uErr.Name), true
 			}
 		}
 	}
+	klog.Infof("!!!! 7")
 	return "", "", false
 }