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

Jump to bottom

[release-3.11] handle non-kubernetes containers with journald log driver #1358

Merged
merged 2 commits into from Oct 11, 2018
Merged

[release-3.11] handle non-kubernetes containers with journald log driver #1358

merged 2 commits into from Oct 11, 2018

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1352

/assign richm

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 24, 2018
Merged
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 24, 2018
@jcantrill
Copy link
Contributor

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 24, 2018
@richm richm added kind/bug Categorizes issue or PR as related to a bug. component/elasticsearch component/fluentd labels Sep 24, 2018
@richm
Copy link
Contributor

richm commented Sep 24, 2018

@jcantrill why hold? I thought release-3.11 branch was open?

@jcantrill
Copy link
Contributor

3.11 is not open

@richm
Copy link
Contributor

richm commented Oct 8, 2018

/retest

@richm richm added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 8, 2018
@richm
Copy link
Contributor

richm commented Oct 9, 2018

/retest

1 similar comment
@nhosoi
Copy link
Contributor

nhosoi commented Oct 10, 2018

/retest

@nhosoi
Copy link
Contributor

nhosoi commented Oct 10, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 10, 2018
@richm richm removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 10, 2018
@openshift-merge-robot openshift-merge-robot merged commit 5a75d5a into openshift:release-3.11 Oct 11, 2018
@richm
Copy link
Contributor

richm commented Oct 12, 2018

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

@richm
Copy link
Contributor

richm commented Oct 15, 2018

/cherrypick release-3.10

@openshift-cherrypick-robot
Copy link
Author

@richm: #1358 failed to apply on top of branch "release-3.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	fluentd/configs.d/openshift/filter-retag-journal.conf
Falling back to patching base and 3-way merge...
Auto-merging fluentd/configs.d/openshift/filter-retag-journal.conf
CONFLICT (content): Merge conflict in fluentd/configs.d/openshift/filter-retag-journal.conf
Patch failed at 0001 treat all non-kubernetes containers as journal.system logs

In response to this:

/cherrypick release-3.10

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
Reviewers

@nhosoi nhosoi Awaiting requested review from nhosoi

@richm richm Awaiting requested review from richm

Assignees

@richm richm

@nhosoi nhosoi

Labels
component/elasticsearch component/fluentd kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release/3.11 size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@openshift-cherrypick-robot @jcantrill @richm @nhosoi @openshift-ci-robot @openshift-merge-robot