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

Make container events belong to pod #181

Merged
merged 2 commits into from
Dec 21, 2017
Merged

Make container events belong to pod #181

merged 2 commits into from
Dec 21, 2017

Conversation

zeari
Copy link

@zeari zeari commented Dec 3, 2017 •
edited
Loading

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1496179

This makes event_data[:event_type] equal POD_FAILED
instead of CONTAINER_FAILED
part of ManageIQ/manageiq#16583

@cben @moolitayer @enoodle Please review

@zeari zeari mentioned this pull request Dec 3, 2017
Merged
@zeari zeari force-pushed the container_events_to_pod branch from 67d0116 to 09b20cc Compare December 3, 2017 15:07
@cben
Copy link
Contributor

cben commented Dec 5, 2017

For some reason I feel I'd keep the EmsEvents names and translate in automate definitions (ManageIQ/manageiq-content#225), eg. CONTAINER_FAILED would raise MiqEvent containergroup_containerfailed.
But don't have any concrete arguments for one or the other, don't think it matters.
LGTM.

moolitayer
moolitayer approved these changes Dec 7, 2017
View reviewed changes
Copy link

@moolitayer moolitayer left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@zeari
Copy link
Author

zeari commented Dec 7, 2017

@miq-bot add_label gaprindashvili/yes

@zeari
Copy link
Author

zeari commented Dec 7, 2017

@miq-bot add_label fine/yes

Ladas
Ladas approved these changes Dec 13, 2017
View reviewed changes
Copy link
Contributor

@Ladas Ladas left a comment

Choose a reason for hiding this comment

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

👍

@zeari zeari force-pushed the container_events_to_pod branch 2 times, most recently from eb04b65 to 471155e Compare December 21, 2017 12:04
@zeari zeari force-pushed the container_events_to_pod branch from 471155e to 8a1ffe7 Compare December 21, 2017 12:07
@zeari zeari force-pushed the container_events_to_pod branch from 8a1ffe7 to 419f802 Compare December 21, 2017 12:13
@miq-bot
Copy link
Member

miq-bot commented Dec 21, 2017

Checked commits zeari/manageiq-providers-kubernetes@5a4b012~...419f802 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. 🍪

@zeari
Copy link
Author

zeari commented Dec 21, 2017 •
edited
Loading

ManageIQ/manageiq#16583 was merged.
@moolitayer can we merge or do we wait for manageiq-content ?

@moolitayer moolitayer merged commit ba505c1 into ManageIQ:master Dec 21, 2017
@moolitayer moolitayer added this to the Sprint 76 Ending Jan 1, 2018 milestone Dec 21, 2017
@moolitayer moolitayer self-assigned this Dec 27, 2017
simaishi pushed a commit that referenced this pull request Jan 3, 2018
@simaishi
Merge pull request #181 from zeari/container_events_to_pod
defd82f 
Make container events belong to pod
(cherry picked from commit ba505c1)

https://bugzilla.redhat.com/show_bug.cgi?id=1530651
@simaishi
Copy link

simaishi commented Jan 3, 2018

Gaprindashvili backport details:

$ git log -1
commit defd82f2cb8fd4ea051acad7502d5c758b8b5654
Author: Mooli Tayer <mtayer@redhat.com>
Date:   Thu Dec 21 17:50:13 2017 +0200

    Merge pull request #181 from zeari/container_events_to_pod
    
    Make container events belong to pod
    (cherry picked from commit ba505c1d55f80165e0d1088f8f8a634a5a0f7c0a)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1530651

@simaishi
Copy link

simaishi commented Jan 4, 2018

Fine backport (to manageiq repo) details:

$ git log -1
commit 0f76ef7fa4468d1bb1f3118d7882a731cb3fe1c3
Author: Mooli Tayer <mtayer@redhat.com>
Date:   Thu Dec 21 17:50:13 2017 +0200

    Merge pull request #181 from zeari/container_events_to_pod
    
    Make container events belong to pod
    (cherry picked from commit ba505c1d55f80165e0d1088f8f8a634a5a0f7c0a)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1530653

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cben cben cben approved these changes

@Ladas Ladas Ladas approved these changes

@moolitayer moolitayer moolitayer approved these changes

Assignees

@moolitayer moolitayer

Labels
events fine/backported gaprindashvili/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@zeari @cben @miq-bot @simaishi @Ladas @moolitayer