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.

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

Bug 1822325: StartMaintenanceModal - Fetch CephCluster resources only when ceph functionality is available #5029

Merged

Conversation

jtomasek
Copy link

No description provided.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 14, 2020
@openshift-ci-robot
Copy link
Contributor

@jtomasek: This pull request references Bugzilla bug 1822325, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1822325: StartMaintenanceModal - Fetch CephCluster resources only when ceph functionality is available

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.

@openshift-ci-robot openshift-ci-robot added the component/metal3 Related to metal3-plugin label Apr 14, 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 Apr 14, 2020
cephClusterHealthy: !cephCluster || _.get(cephCluster, 'status.health') === 'OK',
};
};
type StartNodeMaintenanceModalFirehoseProps = Diff<
Copy link
Contributor

Choose a reason for hiding this comment

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

you could use useK8sWatchResource hook in StartNodeMaintenanceModal and get rid of this component

Copy link
Author

Choose a reason for hiding this comment

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

yep, I'll do that as a follow up, to keep the 4.4 backport simple

close,
cancel,
} = props;
const StartNodeMaintenanceModal = withHandlePromise((props: StartNodeMaintenanceModalProps) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
const StartNodeMaintenanceModal = withHandlePromise((props: StartNodeMaintenanceModalProps) => {
const StartNodeMaintenanceModal = withHandlePromise<StartNodeMaintenanceModalProps>((props) => {

Copy link
Author

Choose a reason for hiding this comment

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

Done

@@ -32,6 +35,9 @@ const StartNodeMaintenanceModal = withHandlePromise((props: NodeMaintenanceModal
return handlePromise(promise).then(close);
};

const cephCluster = _.get(cephClusters, 'data.0');
Copy link
Contributor

Choose a reason for hiding this comment

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

the whole ceph part should be contributed by ceph plugin

@@ -32,6 +35,9 @@ const StartNodeMaintenanceModal = withHandlePromise((props: NodeMaintenanceModal
return handlePromise(promise).then(close);
};

const cephCluster = _.get(cephClusters, 'data.0');
const cephClusterHealthy = !cephCluster || _.get(cephCluster, 'status.health') === 'OK';
Copy link
Contributor

Choose a reason for hiding this comment

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

all _.get usages can be replaced by optional chaining

Copy link
Author

Choose a reason for hiding this comment

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

Done

@rawagner
Copy link
Contributor

/lgtm

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2020
@jtomasek
Copy link
Author

/retest

@rawagner
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jtomasek, rawagner

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 cce48cb into openshift:master Apr 15, 2020
@openshift-ci-robot
Copy link
Contributor

@jtomasek: All pull requests linked via external trackers have merged: openshift/console#5029. Bugzilla bug 1822325 has been moved to the MODIFIED state.

In response to this:

Bug 1822325: StartMaintenanceModal - Fetch CephCluster resources only when ceph functionality is available

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.

@jtomasek
Copy link
Author

/cherrypick release-4.4

@openshift-cherrypick-robot

@jtomasek: #5029 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	frontend/packages/metal3-plugin/src/features.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/metal3-plugin/src/features.ts
CONFLICT (content): Merge conflict in frontend/packages/metal3-plugin/src/features.ts
Patch failed at 0001 Fetch CephCluster resources only when ceph functionality is available

In response to this:

/cherrypick release-4.4

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/metal3 Related to metal3-plugin lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants