From f21868a37f51bb9acdd8f7805149f32a497bf4b9 Mon Sep 17 00:00:00 2001 From: savio87 Date: Tue, 4 Aug 2026 14:56:44 +0530 Subject: [PATCH] OCPBUGS-60768: properly indent multiline node messages in upgrade status output --- .../status/examples/ocpbugs-60768.detailed-output | 12 ++++++------ .../upgrade/status/examples/ocpbugs-60768.output | 12 ++++++------ pkg/cli/admin/upgrade/status/workerpool.go | 9 ++++++++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pkg/cli/admin/upgrade/status/examples/ocpbugs-60768.detailed-output b/pkg/cli/admin/upgrade/status/examples/ocpbugs-60768.detailed-output index c17117741e..9838a854c1 100644 --- a/pkg/cli/admin/upgrade/status/examples/ocpbugs-60768.detailed-output +++ b/pkg/cli/admin/upgrade/status/examples/ocpbugs-60768.detailed-output @@ -13,12 +13,12 @@ machine-config 41m7s - Working towards 4.20.0-0.nightly-2025-08-19-18 Control Plane Nodes NAME ASSESSMENT PHASE VERSION EST MESSAGE ci-op-pw3ghqzh-bb5c4-pdhfc-master-1 Degraded Updating 4.20.0-0.nightly-2025-08-12-153542 ? failed to run command nice (6 tries): [timed out waiting for the condition, running nice -- ionice -c 3 podman pull -q --authfile /var/lib/kubelet/config.json quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0 failed: time="2025-08-19T22:13:54Z" level=warning msg="Failed, retrying in 1s ... (1/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:40349->168.63.129.16:53: i/o timeout" -time="2025-08-19T22:14:05Z" level=warning msg="Failed, retrying in 1s ... (2/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:36467->168.63.129.16:53: i/o timeout" -time="2025-08-19T22:14:16Z" level=warning msg="Failed, retrying in 1s ... (3/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:44244->168.63.129.16:53: i/o timeout" -Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get "https://quay.io/v2/": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:48400->168.63.129.16:53: i/o timeout -: exit status 125] -ci-op-pw3ghqzh-bb5c4-pdhfc-master-0 Outdated Pending 4.20.0-0.nightly-2025-08-12-153542 ? -ci-op-pw3ghqzh-bb5c4-pdhfc-master-2 Completed Updated 4.20.0-0.nightly-2025-08-19-180353 - + time="2025-08-19T22:14:05Z" level=warning msg="Failed, retrying in 1s ... (2/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:36467->168.63.129.16:53: i/o timeout" + time="2025-08-19T22:14:16Z" level=warning msg="Failed, retrying in 1s ... (3/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:44244->168.63.129.16:53: i/o timeout" + Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get "https://quay.io/v2/": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:48400->168.63.129.16:53: i/o timeout + : exit status 125] +ci-op-pw3ghqzh-bb5c4-pdhfc-master-0 Outdated Pending 4.20.0-0.nightly-2025-08-12-153542 ? +ci-op-pw3ghqzh-bb5c4-pdhfc-master-2 Completed Updated 4.20.0-0.nightly-2025-08-19-180353 - = Worker Upgrade = diff --git a/pkg/cli/admin/upgrade/status/examples/ocpbugs-60768.output b/pkg/cli/admin/upgrade/status/examples/ocpbugs-60768.output index 172257777b..3f83d78a7c 100644 --- a/pkg/cli/admin/upgrade/status/examples/ocpbugs-60768.output +++ b/pkg/cli/admin/upgrade/status/examples/ocpbugs-60768.output @@ -9,12 +9,12 @@ Operator Health: 31 Healthy, 3 Available but degraded Control Plane Nodes NAME ASSESSMENT PHASE VERSION EST MESSAGE ci-op-pw3ghqzh-bb5c4-pdhfc-master-1 Degraded Updating 4.20.0-0.nightly-2025-08-12-153542 ? failed to run command nice (6 tries): [timed out waiting for the condition, running nice -- ionice -c 3 podman pull -q --authfile /var/lib/kubelet/config.json quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0 failed: time="2025-08-19T22:13:54Z" level=warning msg="Failed, retrying in 1s ... (1/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:40349->168.63.129.16:53: i/o timeout" -time="2025-08-19T22:14:05Z" level=warning msg="Failed, retrying in 1s ... (2/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:36467->168.63.129.16:53: i/o timeout" -time="2025-08-19T22:14:16Z" level=warning msg="Failed, retrying in 1s ... (3/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:44244->168.63.129.16:53: i/o timeout" -Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get "https://quay.io/v2/": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:48400->168.63.129.16:53: i/o timeout -: exit status 125] -ci-op-pw3ghqzh-bb5c4-pdhfc-master-0 Outdated Pending 4.20.0-0.nightly-2025-08-12-153542 ? -ci-op-pw3ghqzh-bb5c4-pdhfc-master-2 Completed Updated 4.20.0-0.nightly-2025-08-19-180353 - + time="2025-08-19T22:14:05Z" level=warning msg="Failed, retrying in 1s ... (2/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:36467->168.63.129.16:53: i/o timeout" + time="2025-08-19T22:14:16Z" level=warning msg="Failed, retrying in 1s ... (3/3). Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get \"https://quay.io/v2/\": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:44244->168.63.129.16:53: i/o timeout" + Error: initializing source docker://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bab0cd6a692bb7021640889ca69a11d6fc6df1af210c4e24d4feef81c6d7b0: pinging container registry quay.io: Get "https://quay.io/v2/": dial tcp: lookup quay.io on 168.63.129.16:53: read udp 10.0.0.6:48400->168.63.129.16:53: i/o timeout + : exit status 125] +ci-op-pw3ghqzh-bb5c4-pdhfc-master-0 Outdated Pending 4.20.0-0.nightly-2025-08-12-153542 ? +ci-op-pw3ghqzh-bb5c4-pdhfc-master-2 Completed Updated 4.20.0-0.nightly-2025-08-19-180353 - = Worker Upgrade = diff --git a/pkg/cli/admin/upgrade/status/workerpool.go b/pkg/cli/admin/upgrade/status/workerpool.go index 2bd146940b..dc61889cb7 100644 --- a/pkg/cli/admin/upgrade/status/workerpool.go +++ b/pkg/cli/admin/upgrade/status/workerpool.go @@ -557,7 +557,14 @@ func (pool *poolDisplayData) WriteNodes(w io.Writer, detailed bool) { _, _ = tabw.Write([]byte(node.Phase.String() + "\t")) _, _ = tabw.Write([]byte(version + "\t")) _, _ = tabw.Write([]byte(node.Estimate + "\t")) - _, _ = tabw.Write([]byte(node.Message + "\n")) + lines := strings.Split(node.Message, "\n") + for i, line := range lines { + if i == 0 { + _, _ = tabw.Write([]byte(line + "\n")) + } else { + _, _ = tabw.Write([]byte("\t\t\t\t\t" + line + "\n")) + } + } } tabw.Flush() if total > 0 {