Skip to content

OTA-1601: Better the Updating Cluster Operators table #2077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 5 commits into from
Aug 15, 2025
Merged

OTA-1601: Better the Updating Cluster Operators table #2077

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c2b7f4
Reproduce the line break issue
hongkailiu Aug 14, 2025
970f883
status: improve line break handling for CO Message
hongkailiu Aug 14, 2025
11f9f47
Reproduce the long reason issue
hongkailiu Aug 14, 2025
a352662
Truncate long reasons
hongkailiu Aug 14, 2025
5f1dbb8
Move not-lines-related table.Write out of the loop
hongkailiu Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions pkg/cli/admin/upgrade/status/controlplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,17 @@ func (d *controlPlaneStatusDisplayData) Write(f io.Writer, detailed bool, now ti
if reason == "" {
reason = "-"
}
_, _ = 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"))
lines := strings.Split(o.Condition.Message, "\n")
for i, line := range lines {
if i == 0 {
_, _ = 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(line + "\n"))
} else {
_, _ = table.Write([]byte("\t\t\t" + line + "\n"))
}
}
}
if err := table.Flush(); err != nil {
return err
Expand Down
6 changes: 4 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.16.0-single-node-co.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,8 +1252,10 @@ 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'
message: |-
NodeInstallerProgressing: 1 node is at revision 8; 0 nodes have achieved new revision 10
Test line breaks
New line
reason: NodeInstaller
status: "True"
type: Progressing
Expand Down
2 changes: 2 additions & 0 deletions pkg/cli/admin/upgrade/status/examples/4.16.0-single-node.detailed-output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ 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
Test line breaks
New line

Control Plane Nodes
NAME ASSESSMENT PHASE VERSION EST MESSAGE
Expand Down