OTA-1165: `adm upgrade status`: Add Worker Node Status by DavidHurta · Pull Request #1689 · openshift/oc

DavidHurta · 2024-02-19T16:51:37Z

The goal of this pull request is to display additional information upon executing oc adm upgrade status.

The new additional information being the status of worker pools and nodes.

An example of an output:

An update is in progress for 14m4s: Working towards 4.14.1: 734 of 859 done (85% complete), waiting on machine-config

= Control Plane =
Assessment:      Progressing
Completion:      97%
Duration:        14m4s
Operator Status: 33 Total, 32 Available, 1 Progressing, 0 Degraded

= Worker Upgrade =

= Worker Pool =
Worker Pool:     worker
Assessment:      Progressing
Completion:      0%
Worker Status:   3 Total, 2 Available, 1 Progressing, 3 Outdated, 1 Draining, 0 Excluded, 0 Degraded

Worker Pool Node(s)
NAME                                        ASSESSMENT    PHASE      VERSION   EST    MESSAGE
ip-10-0-4-159.us-east-2.compute.internal    Progressing   Draining   4.14.0    +30m   
ip-10-0-20-162.us-east-2.compute.internal   Outdated      Pending    4.14.0    ?      
ip-10-0-99-40.us-east-2.compute.internal    Outdated      Pending    4.14.0    ?      

= Worker Pool =
Worker Pool:     infra
Assessment:      Progressing
Completion:      0%
Worker Status:   2 Total, 1 Available, 1 Progressing, 2 Outdated, 1 Draining, 0 Excluded, 0 Degraded

Worker Pool Node(s)
NAME                                              ASSESSMENT    PHASE      VERSION   EST    MESSAGE
ip-10-0-4-159-infra.us-east-2.compute.internal    Progressing   Draining   4.14.0    +30m   
ip-10-0-20-162-infra.us-east-2.compute.internal   Outdated      Pending    4.14.0    ?      

= Update Health =
SINCE   LEVEL   IMPACT   MESSAGE
14m4s   Info    None     Upgrade is proceeding well

This pull request references https://issues.redhat.com//browse/OTA-1165

openshift-ci-robot · 2024-02-19T16:51:41Z

@Davoska: This pull request references OTA-1165 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2024-02-19T16:51:46Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

DavidHurta · 2024-02-19T16:52:05Z

/test all

DavidHurta · 2024-02-19T21:38:25Z

/retest

DavidHurta · 2024-02-22T18:46:41Z

/uncc @deads2k @mfojtik

DavidHurta · 2024-02-22T18:50:15Z

/cc @petr-muller @wking @LalatenduMohanty

Update the old examples to contain information regarding worker pools.

openshift-ci-robot · 2024-03-04T18:36:55Z

@Davoska: This pull request references OTA-1165 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

Details

In response to this:

The goal of this pull request is to display additional information upon executing oc adm upgrade status.

The new additional information being the status of worker pools and nodes.

An example of an output:

An update is in progress for 14m4s: Working towards 4.14.1: 734 of 859 done (85% complete), waiting on machine-config

= Control Plane =
Assessment:      Progressing
Completion:      97%
Duration:        14m4s
Operator Status: 33 Total, 32 Available, 1 Progressing, 0 Degraded

= Worker Upgrade =

= Worker Pool =
Worker Pool:     worker
Assessment:      Progressing
Completion:      0%
Worker Status:   3 Total, 2 Available, 1 Progressing, 3 Outdated, 1 Draining, 0 Excluded, 0 Degraded

Worker Pool Node(s)
NAME                                        ASSESSMENT    PHASE      VERSION   EST    MESSAGE
ip-10-0-4-159.us-east-2.compute.internal    Progressing   Draining   4.14.0    +30m   
ip-10-0-20-162.us-east-2.compute.internal   Outdated      Pending    4.14.0    ?      
ip-10-0-99-40.us-east-2.compute.internal    Outdated      Pending    4.14.0    ?      

= Worker Pool =
Worker Pool:     infra
Assessment:      Progressing
Completion:      0%
Worker Status:   2 Total, 1 Available, 1 Progressing, 2 Outdated, 1 Draining, 0 Excluded, 0 Degraded

Worker Pool Node(s)
NAME                                              ASSESSMENT    PHASE      VERSION   EST    MESSAGE
ip-10-0-4-159-infra.us-east-2.compute.internal    Progressing   Draining   4.14.0    +30m   
ip-10-0-20-162-infra.us-east-2.compute.internal   Outdated      Pending    4.14.0    ?      

= Update Health =
SINCE   LEVEL   IMPACT   MESSAGE
14m4s   Info    None     Upgrade is proceeding well

This pull request references https://issues.redhat.com//browse/OTA-1165

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

DavidHurta · 2024-03-05T10:08:50Z

/retest

DavidHurta · 2024-03-05T17:41:19Z

/retest

petr-muller · 2024-03-05T22:00:28Z

/retitle OTA-1165: adm upgrade status: Add Worker Node Status

…tatus

After the control plane is updated, the correct update duration should still be displayed. Originally, the duration would start over after a control plane is updated because the LastTransitionTime would change in the Progressing condition.

The original values were displayed incorrectly and didn't sum to a correct value.

The needed MCO logic for worker node status is copied over from the machine-config-operator repository [1]. The required files are copied over and slightly modified if needed. This is done because vendoring the original packages from [1] results in massive vendoring changes due to a small experimental functionality that will be eventually removed and carried over to a server. The alternative is to vendor the original packages and introduce the massive vendoring changes. [1] https://github.com/openshift/machine-config-operator/tree/11d5151a784c7d4be5255ea41acfbf5092eda592

Steps: go mod vendor

petr-muller

🎉

Really nice job, thanks 👍

petr-muller · 2024-03-06T16:26:13Z

/lgtm
/approve

petr-muller · 2024-03-06T16:29:05Z

/cc @ardaguclu

Arda, can we have an /approve for the vendor/* changes? The 092156a commit just runs go mod vendor which vendors more pieces of o/api and o/client-go. No new dependencies are actually added in go.mod.

ardaguclu

Vendor changes look good to me;
/approve

ardaguclu · 2024-03-06T16:40:00Z

@@ -0,0 +1,162 @@
+apiVersion: v1


nit: Do we really need to all these examples that are unnecessarily increasing repo size?

I agree the inputs grew a bit :( I do not expect us to add more testcases but I think we'll eventually need more inputs; I'll make sure we come up with some solution until then, maybe write a script that prunes the mock data from unnecessary members or something similar.

openshift-ci · 2024-03-06T16:45:00Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ardaguclu, Davoska, petr-muller

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [ardaguclu]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2024-03-06T19:52:41Z

@Davoska: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-bot · 2024-03-07T04:40:41Z

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-enterprise-cli-container-v4.16.0-202403070215.p0.g45fe5d4.assembly.stream.el8 for distgit openshift-enterprise-cli.
All builds following this will include this PR.

DavidHurta · 2024-03-11T15:15:54Z

Thank you, @petr-muller, for all the suggestions, recommendations, and tips on and off GitHub!

It made this pull request much better 🎉

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 19, 2024

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 19, 2024

DavidHurta marked this pull request as ready for review February 19, 2024 17:04

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 19, 2024

openshift-ci Bot requested review from deads2k and mfojtik February 19, 2024 17:07

openshift-ci Bot removed request for deads2k and mfojtik February 22, 2024 18:46

openshift-ci Bot requested review from LalatenduMohanty, petr-muller and wking February 22, 2024 18:50

DavidHurta mentioned this pull request Feb 26, 2024

OTA-1174: upgrade status: --details shows descriptions and references #1690

Closed

petr-muller reviewed Feb 26, 2024

View reviewed changes

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 28, 2024

pkg/cli/admin/upgrade/status/examples: Update examples

cf7a169

Update the old examples to contain information regarding worker pools.

DavidHurta force-pushed the worker-node-status branch from fac14d9 to ca178cd Compare March 4, 2024 18:28

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 4, 2024

openshift-ci Bot changed the title ~~OTA-1165: Add Worker Node Status~~ OTA-1165: adm upgrade status: Add Worker Node Status Mar 5, 2024

petr-muller reviewed Mar 5, 2024

View reviewed changes

Comment thread pkg/cli/admin/upgrade/status/status.go Outdated

Comment thread pkg/cli/admin/upgrade/status/workerpool.go Outdated

pkg/cli/admin/upgrade/status/examples: Add examples for worker pool s…

1fac3a2

…tatus

DavidHurta added 5 commits March 6, 2024 14:48

adm update status: Add worker pool status

5e651bc

adm update status: Fix "Omitted additional... nodes" text

d7f858e

The original values were displayed incorrectly and didn't sum to a correct value.

vendor: Add machineconfiguration client and API

092156a

Steps: go mod vendor

DavidHurta force-pushed the worker-node-status branch from bef8d91 to 092156a Compare March 6, 2024 13:51

petr-muller approved these changes Mar 6, 2024

View reviewed changes

openshift-ci Bot requested a review from ardaguclu March 6, 2024 16:29

openshift-ci Bot assigned petr-muller Mar 6, 2024

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2024

ardaguclu reviewed Mar 6, 2024

View reviewed changes

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 6, 2024

openshift-merge-bot Bot merged commit 45fe5d4 into openshift:master Mar 6, 2024

coderabbitai Bot mentioned this pull request Aug 23, 2026

feat: add OpenPERouter baremetal E2E deploy lane openshift/release#83858

Open

Uh oh!

Conversation

DavidHurta commented Feb 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Feb 19, 2024 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Feb 19, 2024

Uh oh!

DavidHurta commented Feb 19, 2024

Uh oh!

DavidHurta commented Feb 19, 2024

Uh oh!

DavidHurta commented Feb 22, 2024

Uh oh!

DavidHurta commented Feb 22, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openshift-ci-robot commented Mar 4, 2024 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DavidHurta commented Mar 5, 2024

Uh oh!

DavidHurta commented Mar 5, 2024

Uh oh!

petr-muller commented Mar 5, 2024 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petr-muller left a comment

Choose a reason for hiding this comment

Uh oh!

petr-muller commented Mar 6, 2024

Uh oh!

petr-muller commented Mar 6, 2024

Uh oh!

ardaguclu left a comment

Choose a reason for hiding this comment

Uh oh!

ardaguclu Mar 6, 2024

Choose a reason for hiding this comment

Uh oh!

petr-muller Mar 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Mar 6, 2024

Uh oh!

openshift-ci Bot commented Mar 6, 2024

Uh oh!

openshift-bot commented Mar 7, 2024

Uh oh!

DavidHurta commented Mar 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

DavidHurta commented Feb 19, 2024 •

edited

Loading

openshift-ci-robot commented Feb 19, 2024 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Mar 4, 2024 •

edited by openshift-ci Bot

Loading

petr-muller commented Mar 5, 2024 •

edited by openshift-ci Bot

Loading

petr-muller Mar 6, 2024 •

edited

Loading