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

Reduce size of images fluentd-gcp and fluentd-elasticsearch #29883

Merged
merged 2 commits into from
Aug 23, 2016

Conversation

aledbf
Copy link
Member

@aledbf aledbf commented Aug 1, 2016

replaces #26652

aledbf/fluentd-elasticsearch                   1.19 769ece5c8ba8 About an hour ago 269.9 MB
gcr.io/google_containers/fluentd-elasticsearch 1.18 0a8cbfbea7f7 5 weeks ago       530.3 MB

aledbf/fluentd-gcp                             1.22 ef979b82a767 About an hour ago 307.9 MB
gcr.io/google_containers/fluentd-gcp           1.21 0ef09b1bcfd7 2 weeks ago       498.5 MB

closes #29782


This change is Reviewable

@aledbf
Copy link
Member Author

aledbf commented Aug 1, 2016

ping @a-robinson

@k8s-bot
Copy link

k8s-bot commented Aug 1, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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
@k8s-bot
Copy link

k8s-bot commented Aug 1, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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.

@k8s-bot
Copy link

k8s-bot commented Aug 1, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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.

@k8s-bot
Copy link

k8s-bot commented Aug 1, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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.

@k8s-bot
Copy link

k8s-bot commented Aug 1, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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.

@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Aug 1, 2016
@bprashanth
Copy link
Contributor

ok to test

@aledbf aledbf force-pushed the fluent-image-size branch 2 times, most recently from 0a5add9 to a2e9b11 Compare August 2, 2016 17:43
@a-robinson a-robinson assigned piosz and unassigned zmerlynn Aug 2, 2016
@a-robinson
Copy link
Contributor

@piosz, mind reviewing this?

@aledbf
Copy link
Member Author

aledbf commented Aug 11, 2016

@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
Copy link
Member

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.

Copy link
Member Author

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

@piosz
Copy link
Member

piosz commented Aug 11, 2016

cc @jimmidyson

@piosz
Copy link
Member

piosz commented Aug 11, 2016

Overall looks good. What's the difference between this and #26652?

@piosz
Copy link
Member

piosz commented Aug 11, 2016

cc @igorpeshansky

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
Copy link
Member

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?

Copy link
Member

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?

Copy link
Member Author

@aledbf aledbf Aug 11, 2016

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

@aledbf
Copy link
Member Author

aledbf commented Aug 11, 2016

Overall looks good. What's the difference between this and #26652?

Now Ubuntu Xenial is supported for the logging agent
#26652 (comment)

@aledbf aledbf force-pushed the fluent-image-size branch from a2e9b11 to 080a770 Compare August 11, 2016 12:13
@igorpeshansky
Copy link

igorpeshansky commented Aug 11, 2016

Now Ubuntu Xenial is supported for the logging agent

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.

@aledbf aledbf force-pushed the fluent-image-size branch 3 times, most recently from d5cb3c2 to 9c605f3 Compare August 11, 2016 15:31
@bgrant0607
Copy link
Member

ref #29782

@aledbf aledbf force-pushed the fluent-image-size branch from 9c605f3 to ebc5ec6 Compare August 16, 2016 16:45
@aledbf
Copy link
Member Author

aledbf commented Aug 16, 2016

We want to use official images. I can make a build once the PR is merged.

@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)

@aledbf
Copy link
Member Author

aledbf commented Aug 22, 2016

@piosz ping

@piosz piosz added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Aug 23, 2016
@@ -8,7 +8,7 @@ metadata:
spec:
containers:
- name: fluentd-elasticsearch
image: gcr.io/google_containers/fluentd-elasticsearch:1.17
Copy link
Member

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

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@piosz
Copy link
Member

piosz commented Aug 23, 2016

@aledbf sorry for the delay. The PR look goods. The plan is:

  1. merge this PR without changing the image version (as commented inline)
  2. I will build the new images
  3. you will sent the follow up PR which bumps the image version

@piosz piosz added this to the v1.4 milestone Aug 23, 2016
@@ -28,7 +28,7 @@

.PHONY: kbuild kpush

TAG = 1.21
TAG = 1.25
Copy link
Member

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?

Copy link
Member Author

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

Copy link
Member

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.

@aledbf aledbf force-pushed the fluent-image-size branch from ebc5ec6 to e2c5015 Compare August 23, 2016 11:21
@k8s-bot
Copy link

k8s-bot commented Aug 23, 2016

GCE e2e build/test passed for commit e2c5015.

@piosz
Copy link
Member

piosz commented Aug 23, 2016

LGTM, thanks for the change!

@piosz piosz added lgtm "Looks good to me", indicates that a PR is ready to be merged. retest-not-required labels Aug 23, 2016
@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit e5fbea6 into kubernetes:master Aug 23, 2016
@piosz
Copy link
Member

piosz commented Aug 23, 2016

I've build the the following images:
gcr.io/google_containers/fluentd-elasticsearch:1.19
gcr.io/google_containers/fluentd-gcp:1.25

Could you please bump the versions as I wrote here #29883 (comment)?

@aledbf aledbf mentioned this pull request Aug 23, 2016
@aledbf
Copy link
Member Author

aledbf commented Aug 23, 2016

@piosz done

@aledbf aledbf deleted the fluent-image-size branch August 23, 2016 13:12
k8s-github-robot pushed a commit that referenced this pull request Aug 25, 2016
Automatic merge from submit-queue

Update fluent images

continues #29883 
fix #29782

```release-note
Reduced size of fluentd images.
```
@aledbf
Copy link
Member Author

aledbf commented Oct 20, 2016

@mindjiver please check the comments in #33584

k8s-github-robot pushed a commit that referenced this pull request Jan 11, 2017
…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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reduce size of fluentd baseimage