Support journal logs in fluentd-gcp on GCI #27981
Merged
+329
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a-robinson
added
the
release-note
|
Does most of the work to fix #27446 |
k8s-github-robot
added
the
size/XL
|
This puts the GCI-specific manifests in |
| @@ -30,17 +30,21 @@ ENV DO_NOT_INSTALL_CATCH_ALL_CONFIG true | |||
|
|
|||
| RUN apt-get -q update && \ | |||
| apt-get install -y curl && \ | |||
| apt-get install -y gcc && \ | |||
| apt-get install -y make && \ | |||
| apt-get clean && \ | |||
There was a problem hiding this comment.
@a-robinson fyi, Found another tip to cleanup files in addition to "apt-get clean" in this PR:
8b20890
rm -rf /var/lib/apt/lists/*
a-robinson
changed the title
|
Note that I've removed the fluentd-es part of this PR, as its Dockerfile appears to have bit-rotted well beyond where I feel comfortable trying to get it working with this on such short notice. Even after just installing the relevant gems on top of the fluentd-gcp image, I get the same SSL_connect errors as in #26652. fluentd-es isn't critical for the release, since most users of GCI will be using Google Cloud Logging anyway. |
k8s-github-robot
added
size/L
|
lgtm |
a-robinson
added
the
lgtm
|
cc @erictune as cherry-pick czar |
adityakali
added a commit
to adityakali/kubernetes
that referenced
this pull request
Jun 24, 2016
This makes use of the systemd-journal support added in PR kubernetes#27981 and Fixes kubernetes#27446.
Only run the systemd-journal plugin when on a platform that requests it. The plugin crashes the fluentd process if the journal isn't present, so it can't just be run blindly in all configurations.
k8s-github-robot
removed
the
lgtm
|
Only change was adding the analytics footer to the new README.md |
a-robinson
added
lgtm
|
GCE e2e build/test passed for commit 19bf9d0. |
|
Automatic merge from submit-queue |
k8s-github-robot
pushed a commit
that referenced
this pull request
Jun 24, 2016
Automatic merge from submit-queue Use new fluentd-gcp container with journal support This makes use of the systemd-journal support added in PR #27981 and Fixes #27446. cc/ @a-robinson @andyzheng0831
a-robinson
pushed a commit
to a-robinson/kubernetes
that referenced
this pull request
Jun 24, 2016
This makes use of the systemd-journal support added in PR kubernetes#27981 and Fixes kubernetes#27446.
a-robinson
added
cherry-pick-approved
roberthbailey
removed
cherry-pick-approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This maintains a single common image for each rather than having to fork out separate images, relying on different commands in yaml manifests to differentiate in the behavior. This is treading on top of @adityakali's #27906, but I wasn't able to get in touch with him this afternoon until very recently. He's handling making sure that the new yaml manifests are used when running on GCI.