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

[17.09] Don't filter nodes if logdriver==none or logdriver=="" #2442

Merged
merged 3 commits into from Nov 18, 2017

Conversation

Projects
None yet
4 participants
@nishanttotla
Contributor

nishanttotla commented Nov 13, 2017

This is a cherry-pick of #2396 and #2438 applied in that order.

git cherry-pick -s -x 9608c63711181bff3a33c71f763aedde2d3596ec
git cherry-pick -s -x 05c8675eeeece04daffec34c5f99769b560d2d0d

Cherry-picks were clean (when applied in order).

I had to also update vendoring by re-running vndr with the latest version.

cpuguy83 and others added some commits Oct 5, 2017

Don't filter nodes if logdriver==none
The "none" driver is a special keyword to disable logging, so don't
filter nodes if the "none" driver is not listed on the nodes, since it's
not really a driver and doesn't exist.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 9608c63)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Avoid running plugin filter when Log Driver does not have a Name
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit 05c8675)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
@nishanttotla

This comment has been minimized.

Show comment
Hide comment
@nishanttotla
Contributor

nishanttotla commented Nov 13, 2017

@cpuguy83

LGTM

Re-run vndr after updating version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Nov 13, 2017

Codecov Report

Merging #2442 into bump_v17.09 will decrease coverage by 5.14%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##           bump_v17.09    #2442      +/-   ##
===============================================
- Coverage        65.36%   60.21%   -5.15%     
===============================================
  Files               80      128      +48     
  Lines            14477    26154   +11677     
===============================================
+ Hits              9463    15749    +6286     
- Misses            4241     9016    +4775     
- Partials           773     1389     +616

codecov bot commented Nov 13, 2017

Codecov Report

Merging #2442 into bump_v17.09 will decrease coverage by 5.14%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##           bump_v17.09    #2442      +/-   ##
===============================================
- Coverage        65.36%   60.21%   -5.15%     
===============================================
  Files               80      128      +48     
  Lines            14477    26154   +11677     
===============================================
+ Hits              9463    15749    +6286     
- Misses            4241     9016    +4775     
- Partials           773     1389     +616
@thaJeztah

LGTM

@nishanttotla nishanttotla merged commit 9f2ac09 into docker:bump_v17.09 Nov 18, 2017

3 checks passed

ci/circleci Your tests passed on CircleCI!
Details
codecov/project 60.21% (target 0%)
Details
dco-signed All commits are signed

@nishanttotla nishanttotla deleted the nishanttotla:log-driver-plugin-filter-17.09 branch Nov 18, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment