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

Reinstated sidecar for query, plus small refactoring of sidecar #246

Merged

Conversation

jpkrohling
Copy link
Contributor

@jpkrohling jpkrohling commented Feb 28, 2019

This PR fixes #244 and applies a small refactoring to the sidecar injection. Special attention to the change to the annotation name, from "inject-jaeger-agent" to "sidecar.jaegertracing.io/inject" (already using a scheme from #201).

Signed-off-by: Juraci Paixão Kröhling [email protected]

@jpkrohling
Copy link
Contributor Author

This change is Reviewable

@jpkrohling
Copy link
Contributor Author

cc @jkandasa

@codecov
Copy link

codecov bot commented Feb 28, 2019

Codecov Report

Merging #246 into master will decrease coverage by 0.36%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #246      +/-   ##
==========================================
- Coverage   89.69%   89.32%   -0.37%     
==========================================
  Files          62       62              
  Lines        2717     2745      +28     
==========================================
+ Hits         2437     2452      +15     
- Misses        181      189       +8     
- Partials       99      104       +5
Impacted Files Coverage Δ
pkg/deployment/query.go 100% <100%> (ø) ⬆️
pkg/inject/sidecar.go 100% <100%> (ø) ⬆️
pkg/strategy/streaming.go 100% <100%> (ø) ⬆️
pkg/deployment/all-in-one.go 100% <100%> (ø) ⬆️
pkg/strategy/production.go 75.4% <100%> (ø) ⬆️
pkg/deployment/collector.go 100% <100%> (ø) ⬆️
pkg/controller/jaeger/elasticsearch.go 59.09% <0%> (-4.55%) ⬇️
pkg/controller/jaeger/jaeger_controller.go 32.92% <0%> (-0.41%) ⬇️
pkg/storage/elasticsearch.go 79.81% <0%> (-0.19%) ⬇️
pkg/storage/elasticsearch_secrets.go 100% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9302c08...b609551. Read the comment docs.

@jpkrohling jpkrohling requested review from objectiser and pavolloffay and removed request for pavolloffay March 4, 2019 16:10
Copy link
Contributor

@objectiser objectiser left a comment

Choose a reason for hiding this comment

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

LGTM - just wondering if a test is required on production.go and streaming.go just to confirm that the query has a sidecar?

Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
Copy link
Contributor Author

Test added

@jpkrohling jpkrohling merged commit 91b66a8 into jaegertracing:master Mar 4, 2019
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.

There is no option to enable agent as a sidecar for jaeger-query service
2 participants