-
Notifications
You must be signed in to change notification settings - Fork 183
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
Bundle kubernetes_metadata plugin with fix for Fluentd pod restarts #1183
Conversation
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.
Given that it passed the review in the upstream I'm giving 👍 :)
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.
Just 2 things:
- I'd say it would be good to specify the version of this plugin that we include in our repo (e.g. in a comment in
Dockerfile
?) - rebase on
main
to get the checks passed
Replicates changes from this PR on upstream: fabric8io/fluent-plugin-kubernetes_metadata_filter#267
f6a3beb
to
0ccadca
Compare
Might help if we decide to switch back to using upstream at one moment.
The plugin version is already there in the fluent-plugin-kubernetes-metadata-filter.gemspec file. I've added information about the code's origin in the plugin's README for greater visibility. |
…1183) This change bundles the `kubernetes_metadata` Fluentd plugin from https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter/ into our repo, as the upstream is not active and our [pull request there](fabric8io/fluent-plugin-kubernetes_metadata_filter#267) is not being merged despite being accepted. This code was copied from upstream at commit fabric8io/fluent-plugin-kubernetes_metadata_filter@84f66a8 on `master` branch from Oct 8th, 2020. On that commit, changes from the pull request fabric8io/fluent-plugin-kubernetes_metadata_filter#267 have been applied.
…1183) (#1193) This change bundles the `kubernetes_metadata` Fluentd plugin from https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter/ into our repo, as the upstream is not active and our [pull request there](fabric8io/fluent-plugin-kubernetes_metadata_filter#267) is not being merged despite being accepted. This code was copied from upstream at commit fabric8io/fluent-plugin-kubernetes_metadata_filter@84f66a8 on `master` branch from Oct 8th, 2020. On that commit, changes from the pull request fabric8io/fluent-plugin-kubernetes_metadata_filter#267 have been applied.
Description
This PR bundles the
kubernetes_metadata
Fluentd plugin from https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter/ into our repo, as the upstream is not active and our pull request there is not being merged despite being accepted.There are two commits in this PR: the first one bundles the plugin's sources from
master
(at commit fabric8io/fluent-plugin-kubernetes_metadata_filter@84f66a8 from Oct 8), the second one incorporates changes from the pull request fabric8io/fluent-plugin-kubernetes_metadata_filter#267.Testing performed