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

Add debian based images #12

Merged
merged 5 commits into from
May 24, 2017
Merged

Add debian based images #12

merged 5 commits into from
May 24, 2017

Conversation

chancez
Copy link
Contributor

@chancez chancez commented Apr 20, 2017

Also adds the fluentd-plugin-systemd gem + config for debian based images

Note that this PR changes the folder layout in docker-images/, so it may
require updating automated docker builds if it depends on the folder structure.

@chancez
Copy link
Contributor Author

chancez commented Apr 20, 2017

The 1st commit updates the Makefile + templates, the 2nd commit is the result of re-running make src-all, so it's all generated output.

The 3rd commit updates the Makefile + templates to install and configure the systemd plugin for debian images.
The 4th commit regenerates the docker-images directory with the systemd plugin changes.

@chancez
Copy link
Contributor Author

chancez commented Apr 20, 2017

I've got the ES debian image built here: https://quay.io/repository/coreos/fluentd-kubernetes?tab=tags in case you would like to try/look. I've tested this on my Kubernetes cluster and it works great so far. I'm seeing systemd logs, and fluentd is running as expected.

@edsiper
Copy link
Member

edsiper commented Apr 26, 2017

@so0k @c-knowles : since you helped to put in place #4, would you please help to review these changes ?

@so0k
Copy link
Contributor

so0k commented Apr 27, 2017

I'll have a look

@so0k
Copy link
Contributor

so0k commented May 3, 2017

Sorry, didn't have time yet to review - glancing over https://github.com/coreos/fluentd-kubernetes-daemonset/tree/add_debian_image - seems README is not updated yet?

@chancez chancez force-pushed the add_debian_image branch 2 times, most recently from 0f04bab to b95edcc Compare May 5, 2017 17:48
@chancez
Copy link
Contributor Author

chancez commented May 5, 2017

@so0k Updated the README.

@so0k
Copy link
Contributor

so0k commented May 8, 2017

Thanks @chancez - I've merged your changes to my fork (which has automated docker hub builds as well...).

Unfortunately, relative links in the README don't work on DockerHub - so ideally these are still full URLs (sorry for the inconvenience).

Apart from that, LGTM.

@edsiper - when these changes are merged, it is needed to update the build settings on the Docker Hub repository as follows:

  • Update the dockerfile location for each tag
  • Add builds for the debian tags /docker-image/v0.12/debian-...

Final result looks like:

image

NOTE: I Have a typo in the screenshot above (should be /docker-image/... not /docker-images/... (singular, not plural)

EDIT: Added clarification on typo in Screenshot

@chancez
Copy link
Contributor Author

chancez commented May 8, 2017

@so0k I can update the URLs then. One moment.

@chancez chancez force-pushed the add_debian_image branch from b95edcc to 30112c5 Compare May 8, 2017 19:31
@chancez
Copy link
Contributor Author

chancez commented May 8, 2017

I removed the last commit which used relative URLs. I think it should be correct now. (Urls will be broken since the locations of files changed, and the links point to master).

@so0k
Copy link
Contributor

so0k commented May 10, 2017

@edsiper - I believe this can be merged (as well as need to update the docker hub builds)

@edsiper
Copy link
Member

edsiper commented May 24, 2017

thanks for the review.

@so0k how the build settings should looks like ?

@so0k
Copy link
Contributor

so0k commented May 24, 2017

There's a picture here but small mistake, see note

#12 (comment)

@edsiper
Copy link
Member

edsiper commented May 24, 2017

what do you think about to get rid of Alpine based images ?

@chancez I see the Alpine images don't use Jemalloc, to support Alpine we need Jemalloc on it, otherwise memory fragmentation on Fluentd side will be high.

@chancez
Copy link
Contributor Author

chancez commented May 24, 2017

@edsiper I didn't touch alpine, so that's irrelevant to this PR IMO.

@edsiper
Copy link
Member

edsiper commented May 24, 2017

@chancez actually this PR adds Alpine based images:

./docker-image/v0.12/alpine-elasticsearch
./docker-image/v0.12/alpine-elasticsearch/plugins
./docker-image/v0.12/alpine-elasticsearch/plugins/parser_kubernetes.rb
./docker-image/v0.12/alpine-elasticsearch/plugins/.gitkeep
./docker-image/v0.12/alpine-elasticsearch/conf
./docker-image/v0.12/alpine-elasticsearch/conf/systemd.conf
./docker-image/v0.12/alpine-elasticsearch/conf/fluent.conf
./docker-image/v0.12/alpine-elasticsearch/conf/kubernetes.conf
./docker-image/v0.12/alpine-elasticsearch/Dockerfile
./docker-image/v0.12/alpine-elasticsearch/hooks
./docker-image/v0.12/alpine-elasticsearch/hooks/post_push
./docker-image/v0.12/alpine-elasticsearch/.dockerignore
./docker-image/v0.12/alpine-cloudwatch
./docker-image/v0.12/alpine-cloudwatch/plugins
./docker-image/v0.12/alpine-cloudwatch/plugins/parser_kubernetes.rb
./docker-image/v0.12/alpine-cloudwatch/plugins/.gitkeep
./docker-image/v0.12/alpine-cloudwatch/conf
./docker-image/v0.12/alpine-cloudwatch/conf/systemd.conf
./docker-image/v0.12/alpine-cloudwatch/conf/fluent.conf
./docker-image/v0.12/alpine-cloudwatch/conf/kubernetes.conf
./docker-image/v0.12/alpine-cloudwatch/Dockerfile
./docker-image/v0.12/alpine-cloudwatch/hooks
./docker-image/v0.12/alpine-cloudwatch/hooks/post_push
./docker-image/v0.12/alpine-cloudwatch/.dockerignore
./docker-image/v0.12/alpine-loggly
./docker-image/v0.12/alpine-loggly/plugins
./docker-image/v0.12/alpine-loggly/plugins/parser_kubernetes.rb
./docker-image/v0.12/alpine-loggly/plugins/.gitkeep
./docker-image/v0.12/alpine-loggly/conf
./docker-image/v0.12/alpine-loggly/conf/systemd.conf
./docker-image/v0.12/alpine-loggly/conf/fluent.conf
./docker-image/v0.12/alpine-loggly/conf/kubernetes.conf
./docker-image/v0.12/alpine-loggly/Dockerfile
./docker-image/v0.12/alpine-loggly/hooks
./docker-image/v0.12/alpine-loggly/hooks/post_push
./docker-image/v0.12/alpine-loggly/.dockerignore
./docker-image/v0.12/alpine-logentries
./docker-image/v0.12/alpine-logentries/plugins
./docker-image/v0.12/alpine-logentries/plugins/out_logentries.rb
./docker-image/v0.12/alpine-logentries/plugins/parser_kubernetes.rb
./docker-image/v0.12/alpine-logentries/conf
./docker-image/v0.12/alpine-logentries/conf/systemd.conf
./docker-image/v0.12/alpine-logentries/conf/fluent.conf
./docker-image/v0.12/alpine-logentries/conf/kubernetes.conf
./docker-image/v0.12/alpine-logentries/Dockerfile
./docker-image/v0.12/alpine-logentries/hooks
./docker-image/v0.12/alpine-logentries/hooks/post_push
./docker-image/v0.12/alpine-logentries/.dockerignore

@chancez
Copy link
Contributor Author

chancez commented May 24, 2017

@edsiper no, it merely moves the existing alpine generated files to a different directory structure to accommodate multiple base images. The current images use alpine, I'm adding debian.

@edsiper
Copy link
Member

edsiper commented May 24, 2017

Thanks for the clarification, my fault!

@edsiper
Copy link
Member

edsiper commented May 24, 2017

@chancez would you please check the conflict ?, once fixed I will merge it.

@chancez
Copy link
Contributor Author

chancez commented May 24, 2017

@edsiper I opened another PR #20 because the conflict is due to the fact that a change you made was done directly to the generated file instead of the template file. Once that's merged, I'll be rebasing on top of that to fix this.

@edsiper
Copy link
Member

edsiper commented May 24, 2017

#20 merged

@chancez chancez force-pushed the add_debian_image branch from 30112c5 to e4457d5 Compare May 24, 2017 17:51
@chancez
Copy link
Contributor Author

chancez commented May 24, 2017

@edsiper Rebased.

@so0k
Copy link
Contributor

so0k commented May 24, 2017

I can fix readme links and loook into alpine issues after this is merged

@edsiper edsiper merged commit 621789c into fluent:master May 24, 2017
@edsiper
Copy link
Member

edsiper commented May 24, 2017

@so0k @chancez thank you!

I strongly think we should deprecate Alpine linux based images.

@so0k
Copy link
Contributor

so0k commented May 24, 2017

@edsiper are you referring to this https://bugs.alpinelinux.org/issues/5389?

@edsiper
Copy link
Member

edsiper commented May 24, 2017

@so0k that one and others. Personally I have to stop working with Alpine with https://github.com/fluent/fluent-bit because of jemalloc and other Musl compatibility issues.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants