Merge pull request #2077 from hongkailiu/OTA-1601

OTA-1601: Better the Updating Cluster Operators table

Author: openshift-merge-bot[bot]

pkg/cli/admin/upgrade/status/controlplane.go

@@ -498,10 +498,17 @@ func (d *controlPlaneStatusDisplayData) Write(f io.Writer, detailed bool, now ti
 			if reason == "" {
 				reason = "-"
 			}
+			lines := strings.Split(o.Condition.Message, "\n")
 			_, _ = table.Write([]byte(o.Name + "\t"))
 			_, _ = table.Write([]byte(shortDuration(now.Sub(o.Condition.LastTransitionTime.Time)) + "\t"))
-			_, _ = table.Write([]byte(reason + "\t"))
-			_, _ = table.Write([]byte(o.Condition.Message + "\n"))
+			_, _ = table.Write([]byte(ellipsis(reason, 20) + "\t"))
+			for i, line := range lines {
+				if i == 0 {
+					_, _ = table.Write([]byte(line + "\n"))
+				} else {
+					_, _ = table.Write([]byte("\t\t\t" + line + "\n"))
+				}
+			}
 		}
 		if err := table.Flush(); err != nil {
 			return err
@@ -510,6 +517,17 @@ func (d *controlPlaneStatusDisplayData) Write(f io.Writer, detailed bool, now ti
 	return nil
 }
 
+func ellipsis(s string, maxLen int) string {
+	runes := []rune(s)
+	if len(runes) <= maxLen {
+		return s
+	}
+	if maxLen < 3 {
+		maxLen = 3
+	}
+	return string(runes[0:maxLen-3]) + "..."
+}
+
 const controlPlaneStatusTemplateRaw = `= Control Plane =
 Assessment:      {{ .Assessment }}
 Target Version:  {{ .TargetVersion }}

pkg/cli/admin/upgrade/status/examples/4.16.0-single-node-co.yaml

@@ -1252,9 +1252,11 @@ items:
       status: "False"
       type: Degraded
     - lastTransitionTime: "2024-08-05T15:58:26Z"
-      message: 'NodeInstallerProgressing: 1 node is at revision 8; 0 nodes have achieved
-        new revision 10'
-      reason: NodeInstaller
+      message: |-
+        NodeInstallerProgressing: 1 node is at revision 8; 0 nodes have achieved new revision 10
+        Test line breaks
+        New line
+      reason: NodeInstaller::PetrDoesNotLikeLongLines::WhichTakeTooMuchSpace
       status: "True"
       type: Progressing
     - lastTransitionTime: "2024-08-05T15:22:32Z"

pkg/cli/admin/upgrade/status/examples/4.16.0-single-node.detailed-output

@@ -7,8 +7,10 @@ Duration:        2m54s (Est. Time Remaining: 1h9m)
 Operator Health: 32 Healthy, 1 Available but degraded
 
 Updating Cluster Operators
-NAME             SINCE   REASON          MESSAGE
-kube-apiserver   2m      NodeInstaller   NodeInstallerProgressing: 1 node is at revision 8; 0 nodes have achieved new revision 10
+NAME             SINCE   REASON                 MESSAGE
+kube-apiserver   2m      NodeInstaller::Pe...   NodeInstallerProgressing: 1 node is at revision 8; 0 nodes have achieved new revision 10
+                                                Test line breaks
+                                                New line
 
 Control Plane Nodes
 NAME                        ASSESSMENT   PHASE     VERSION                              EST   MESSAGE