Address review feedback: delimiter in digest, wording fix, whitespace normalization

- Add newline delimiter between objects in computePhaseDigest to prevent
  ambiguous concatenation encodings
- Fix API doc: "first successful reconciliation" → "first successful
  resolution" to match actual behavior
- Normalize whitespace in actual condition messages in e2e message
  fragment comparisons to reduce flakiness
- Revert predicate rename to skipProgressDeadlineExceededPredicate

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: pedjak

api/v1/clusterobjectset_types.go

@@ -531,7 +531,7 @@ type ObservedPhase struct {
 	Name string `json:"name"`
 
 	// digest is the hex-encoded SHA-256 digest of the phase's resolved
-	// object content at first successful reconciliation.
+	// object content at first successful resolution.
 	//
 	// +required
 	Digest string `json:"digest"`

applyconfigurations/api/v1/observedphase.go

@@ -635,7 +635,7 @@ spec:
                     digest:
                       description: |-
                         digest is the hex-encoded SHA-256 digest of the phase's resolved
-                        object content at first successful reconciliation.
+                        object content at first successful resolution.
                       type: string
                     name:
                       description: name is the phase name matching a phase in spec.phases.

helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterobjectsets.yaml

@@ -359,7 +359,7 @@ type Sourcoser interface {
 }
 
 func (c *ClusterObjectSetReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	skipTerminallyBlockedPredicate := predicate.Funcs{
+	skipProgressDeadlineExceededPredicate := predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			rev, ok := e.ObjectNew.(*ocv1.ClusterObjectSet)
 			if !ok {
@@ -383,7 +383,7 @@ func (c *ClusterObjectSetReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			&ocv1.ClusterObjectSet{},
 			builder.WithPredicates(
 				predicate.ResourceVersionChangedPredicate{},
-				skipTerminallyBlockedPredicate,
+				skipProgressDeadlineExceededPredicate,
 			),
 		).
 		WatchesRawSource(
@@ -734,6 +734,7 @@ func computePhaseDigest(phase boxcutter.Phase) (string, error) {
 			return "", fmt.Errorf("marshaling object in phase %q: %w", phase.GetName(), err)
 		}
 		h.Write(data)
+		h.Write([]byte{'\n'})
 	}
 	return fmt.Sprintf("%x", h.Sum(nil)), nil
 }

internal/operator-controller/controllers/clusterobjectset_controller.go

@@ -1959,7 +1959,7 @@ spec:
                     digest:
                       description: |-
                         digest is the hex-encoded SHA-256 digest of the phase's resolved
-                        object content at first successful reconciliation.
+                        object content at first successful resolution.
                       type: string
                     name:
                       description: name is the phase name matching a phase in spec.phases.

manifests/experimental-e2e.yaml

@@ -1920,7 +1920,7 @@ spec:
                     digest:
                       description: |-
                         digest is the hex-encoded SHA-256 digest of the phase's resolved
-                        object content at first successful reconciliation.
+                        object content at first successful resolution.
                       type: string
                     name:
                       description: name is the phase name matching a phase in spec.phases.

manifests/experimental.yaml

@@ -511,7 +511,8 @@ func ClusterExtensionReportsConditionWithMessageFragment(ctx context.Context, co
 	if msgFragment != nil {
 		expectedMsgFragment := substituteScenarioVars(strings.Join(strings.Fields(msgFragment.Content), " "), scenarioCtx(ctx))
 		msgCmp = func(actualMsg string) bool {
-			return strings.Contains(actualMsg, expectedMsgFragment)
+			normalizedActual := strings.Join(strings.Fields(actualMsg), " ")
+			return strings.Contains(normalizedActual, expectedMsgFragment)
 		}
 	}
 	return waitForExtensionCondition(ctx, conditionType, conditionStatus, &conditionReason, msgCmp)
@@ -607,7 +608,8 @@ func ClusterObjectSetReportsConditionWithMessageFragment(ctx context.Context, re
 	if msgFragment != nil {
 		expectedMsgFragment := substituteScenarioVars(strings.Join(strings.Fields(msgFragment.Content), " "), scenarioCtx(ctx))
 		msgCmp = func(actualMsg string) bool {
-			return strings.Contains(actualMsg, expectedMsgFragment)
+			normalizedActual := strings.Join(strings.Fields(actualMsg), " ")
+			return strings.Contains(normalizedActual, expectedMsgFragment)
 		}
 	}
 	return waitForCondition(ctx, "clusterobjectset", substituteScenarioVars(revisionName, scenarioCtx(ctx)), conditionType, conditionStatus, &conditionReason, msgCmp)