Skip to content
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

Jump to bottom

Hide upgrade paths and show checklist progress during upgrades #5972

Merged
merged 1 commit into from Jul 20, 2020
Merged

Hide upgrade paths and show checklist progress during upgrades #5972

merged 1 commit into from Jul 20, 2020

Conversation

rhamilto
Copy link
Member

@rhamilto rhamilto commented Jul 13, 2020 •
edited

Watch an upgrade run: https://www.youtube.com/watch?v=TnVbzkFYlvA

Screen Shot 2020-07-16 at 2 41 49 PM

Screen Shot 2020-07-16 at 2 42 03 PM

Screen Shot 2020-07-16 at 2 58 11 PM

View conditions link in action: https://youtu.be/Zm8_Bnum9vI

Screen Shot 2020-07-16 at 2 53 24 PM

View conditions link in action: https://youtu.be/9l9QFjKKwRk

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. component/core Related to console core functionality labels Jul 13, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 13, 2020
@rhamilto rhamilto force-pushed the updating-status branch 7 times, most recently from 0e51b0e to e19fb29 Compare July 15, 2020 13:38
@rhamilto rhamilto added this to the v4.6 milestone Jul 15, 2020
@rhamilto rhamilto force-pushed the updating-status branch 5 times, most recently from 334a70c to 281ac2c Compare July 16, 2020 19:19
@rhamilto rhamilto changed the title [WIP] Hide upgrade paths and show checklist progress during upgrades Hide upgrade paths and show checklist progress during upgrades Jul 16, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 16, 2020
spadgett
spadgett reviewed Jul 16, 2020
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work!

frontend/public/components/cluster-settings/cluster-settings.tsx Outdated Show resolved Hide resolved
frontend/public/components/cluster-settings/cluster-settings.tsx Outdated Show resolved Hide resolved
frontend/public/components/cluster-settings/cluster-settings.tsx Outdated
Comment on lines 853 to 862
{
kind: referenceForModel(MachineConfigPoolModel),
isList: true,
prop: 'machineConfigPools',
},
{
kind: referenceForModel(ClusterOperatorModel),
isList: true,
prop: 'clusterOperators',
},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move these watches into the UpdateProgress component? Then we only watch when an upgrade is in progress. (Consider the useK8sWatch hook instead of Firehose.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want to keep clusterOperators here as <UpdateStatus> is now using it as well, but machineConfigPools can certainly move to <UpdateProgress>. Good catch! It prompted me to notice I was plumbing machineConfigPools through <UpdateStatus> and <UpdatingMessage> but not actually using it (orphaned from previous revisions).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I've addressed this. PTAL, @spadgett.

frontend/public/components/cluster-settings/cluster-settings.tsx Outdated
@@ -626,6 +850,16 @@ export const ClusterSettingsPage: React.SFC<ClusterSettingsPageProps> = ({ match
const resources = [
{ kind: clusterVersionReference, name: 'version', isList: false, prop: 'obj' },
{ kind: clusterAutoscalerReference, isList: true, prop: 'autoscalers', optional: true },
{
kind: referenceForModel(MachineConfigPoolModel),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably want to handle cases where the user doesn't have authority to watch MCPs or the one of the expected MCPs is not there. (For instance, you can have a 3 node cluster without workers.)

Make this optional and hide the progress bar if the MCP is missing or has 0 replicas?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I've addressed this. PTAL, @spadgett.

@rhamilto
Copy link
Member Author

/retest

@rhamilto rhamilto force-pushed the updating-status branch 2 times, most recently from f274611 to 7d082e3 Compare July 17, 2020 19:41
@rhamilto rhamilto requested a review from spadgett July 17, 2020 22:15
@rhamilto
Copy link
Member Author

/retest

spadgett
spadgett approved these changes Jul 20, 2020
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 20, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, spadgett

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-merge-robot openshift-merge-robot merged commit 91fe08d into openshift:master Jul 20, 2020
@rhamilto rhamilto deleted the updating-status branch July 20, 2020 17:07
@spadgett spadgett added the kind/dependency-change Categorizes issue or PR as related to changing dependencies label Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wking wking wking left review comments

@spadgett spadgett spadgett approved these changes

@kyoto kyoto Awaiting requested review from kyoto

Assignees

@spadgett spadgett

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/core Related to console core functionality kind/dependency-change Categorizes issue or PR as related to changing dependencies lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
v4.6
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rhamilto @openshift-ci-robot @wking @spadgett @openshift-merge-robot