-
Notifications
You must be signed in to change notification settings - Fork 40.1k
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
Reduce size of images fluentd-gcp and fluentd-elasticsearch #29883
Conversation
ping @a-robinson |
Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test". This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry. Otherwise, if this message is too spammy, please complain to ixdy. |
4 similar comments
Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test". This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry. Otherwise, if this message is too spammy, please complain to ixdy. |
Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test". This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry. Otherwise, if this message is too spammy, please complain to ixdy. |
Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test". This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry. Otherwise, if this message is too spammy, please complain to ixdy. |
Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test". This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry. Otherwise, if this message is too spammy, please complain to ixdy. |
ok to test |
0a5add9
to
a2e9b11
Compare
@piosz, mind reviewing this? |
@a-robinson @piosz Is there anything I can do to help in the review of this PR? |
@@ -8,7 +8,7 @@ metadata: | |||
spec: | |||
containers: | |||
- name: fluentd-elasticsearch | |||
image: gcr.io/google_containers/fluentd-elasticsearch:1.17 | |||
image: aledbf/fluentd-elasticsearch:1.19 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want to use official images. I can make a build once the PR is merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. I'm just following the procedure defined in the Makefile
cc @jimmidyson |
Overall looks good. What's the difference between this and #26652? |
sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent | ||
|
||
# Install the Elasticsearch Fluentd plug-in. | ||
td-agent-gem install fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should the versions be specified for compatibility? Subsequent builds of this image could install different versions if more recent versions have been released?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also does td-agent-gem
support --no-doc
flag like standard gem
to ensure no docs get installed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dependencies pinned following http://docs.fluentd.org/articles/plugin-management
Also does td-agent-gem support --no-doc flag like standard gem to ensure no docs get installed?
done
Now Ubuntu Xenial is supported for the logging agent |
a2e9b11
to
080a770
Compare
FWIW, as I recall, that was just a documentation change. There logging agent was system-independent, being in Ruby, and didn't need any changes to support Ubuntu Xenial. |
d5cb3c2
to
9c605f3
Compare
ref #29782 |
9c605f3
to
ebc5ec6
Compare
@piosz I put the official repo but this requires the publication of the images before the merge of the PR (it will not pass the tests) |
@piosz ping |
@@ -8,7 +8,7 @@ metadata: | |||
spec: | |||
containers: | |||
- name: fluentd-elasticsearch | |||
image: gcr.io/google_containers/fluentd-elasticsearch:1.17 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should do this change in a follow up PR, once the image is pushed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
@aledbf sorry for the delay. The PR look goods. The plan is:
|
@@ -28,7 +28,7 @@ | |||
|
|||
.PHONY: kbuild kpush | |||
|
|||
TAG = 1.21 | |||
TAG = 1.25 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you bumping this to 1.25?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you bumping this to 1.25?
because the latest version I can pull from gcr is 1.24
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's weird but it's true.
ebc5ec6
to
e2c5015
Compare
GCE e2e build/test passed for commit e2c5015. |
LGTM, thanks for the change! |
Automatic merge from submit-queue |
I've build the the following images: Could you please bump the versions as I wrote here #29883 (comment)? |
@piosz done |
@mindjiver please check the comments in #33584 |
…k8s_metadata Automatic merge from submit-queue Enable kubernetes_metadata by default for ELK stack Looks like it was accidentally removed and was not restored back in this PR #29883 Because actually this plugin still exists in the image, but new ELK deployment don't allow you to index namespaces, pod names, etc.
replaces #26652
closes #29782
This change is