Merge pull request #444 from RadekManak/feature-ccm-flake-fix

NO-JIRA: fix: report all degraded controller conditions instead of first only#444

Author: openshift-merge-bot[bot]

pkg/controllers/clusteroperator_controller.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"sort"
+	"strings"
 
 	configv1 "github.com/openshift/api/config/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
@@ -299,11 +301,12 @@ func (r *CloudOperatorReconciler) checkControllerConditions(ctx context.Context)
 
 	cloudConfigControllerAvailable := false
 	trustedCABundleControllerAvailable := false
+	var degradedMessages []string
 
 	for _, cond := range co.Status.Conditions {
 		if cond.Type == cloudConfigControllerDegradedCondition || cond.Type == trustedCABundleControllerDegradedCondition {
 			if cond.Status == configv1.ConditionTrue {
-				return false, fmt.Errorf("failed to apply resources because %s condition is set to True: %s", cond.Type, cond.Message)
+				degradedMessages = append(degradedMessages, fmt.Sprintf("%s condition is set to True: %s", cond.Type, cond.Message))
 			}
 		}
 
@@ -316,6 +319,11 @@ func (r *CloudOperatorReconciler) checkControllerConditions(ctx context.Context)
 		}
 	}
 
+	if len(degradedMessages) > 0 {
+		sort.Strings(degradedMessages)
+		return false, fmt.Errorf("failed to apply resources because %s", strings.Join(degradedMessages, "; "))
+	}
+
 	return cloudConfigControllerAvailable && trustedCABundleControllerAvailable, nil
 }