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

Bug 1795456: Fix bug where resource filter is broken for GroupVersionKind resources #4112

Merged
merged 1 commit into from Jan 30, 2020
Merged

Bug 1795456: Fix bug where resource filter is broken for GroupVersionKind resources #4112

merged 1 commit into from Jan 30, 2020

Conversation

rhamilto
Copy link
Member

@openshift-ci-robot
Copy link
Contributor

@rhamilto: This pull request references Bugzilla bug 1795456, 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.

In response to this:

Bug 1795456: Fix bug where resource filter is broken for GroupVersionKind resources

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 bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 29, 2020
@rhamilto
Copy link
Member Author

/bugzilla refresh

@openshift-ci-robot
Copy link
Contributor

@rhamilto: This pull request references Bugzilla bug 1795456, which is valid.

In response to this:

/bugzilla refresh

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/core Related to console core functionality label Jan 29, 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 Jan 29, 2020
@rhamilto
Copy link
Member Author

/cherrypick release-4.3

@openshift-cherrypick-robot
Copy link

@rhamilto: once the present PR merges, I will cherry-pick it on top of release-4.3 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.3

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.

spadgett
spadgett reviewed Jan 29, 2020
View reviewed changes
frontend/public/components/events.jsx Outdated
@@ -190,7 +190,7 @@ export class EventsList extends React.Component {
{...this.props}
key={kind}
type={type}
kind={kind}
kind={kindForReference(kind)}
Copy link
Member

Choose a reason for hiding this comment

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

This might have false positives if the same kind is present in different API groups. We probably need to change EventStream to work with the resource/version/kind string.

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 29, 2020
@rhamilto
Copy link
Member Author

@benjaminapetersen please review. @spadgett added the proper fix.

@rhamilto
Copy link
Member Author

/retest

@rhamilto
Copy link
Member Author

This bug also exists in 4.2 and 4.1, so more back porting is necessary.

@rhamilto
Copy link
Member Author

/retest

benjaminapetersen
benjaminapetersen approved these changes Jan 29, 2020
View reviewed changes
Copy link
Contributor

@benjaminapetersen benjaminapetersen 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 Jan 29, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 41331e2 into openshift:master Jan 30, 2020
@openshift-ci-robot
Copy link
Contributor

@rhamilto: All pull requests linked via external trackers have merged. Bugzilla bug 1795456 has been moved to the MODIFIED state.

In response to this:

Bug 1795456: Fix bug where resource filter is broken for GroupVersionKind resources

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-cherrypick-robot
Copy link

@rhamilto: #4112 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	frontend/public/components/events.jsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/components/events.jsx
CONFLICT (content): Merge conflict in frontend/public/components/events.jsx
Patch failed at 0001 Bug 1795456: Fix event filter for resources in API groups

In response to this:

/cherrypick release-4.3

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.

@rhamilto rhamilto deleted the bz1795456 branch January 30, 2020 13:28
@spadgett spadgett added this to the v4.4 milestone Feb 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spadgett spadgett spadgett left review comments

@benjaminapetersen benjaminapetersen benjaminapetersen approved these changes

@kyoto kyoto Awaiting requested review from kyoto

@zherman0 zherman0 Awaiting requested review from zherman0

Assignees

@benjaminapetersen benjaminapetersen

@spadgett spadgett

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/core Related to console core functionality lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v4.4
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@rhamilto @openshift-ci-robot @openshift-cherrypick-robot @openshift-bot @benjaminapetersen @spadgett @openshift-merge-robot