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

Allow sidecar injection for query pod from other Jaeger instances #1569

Merged
merged 2 commits into from
Oct 4, 2021

Conversation

pavolloffay
Copy link
Member

This PR allows injecting jaeger-agent sidecar from another Jaeger instance to jaeger-query.

If the tracing is enabled in jaeger-query deployment the operator adds an annotation sidecar.jaegertracing.io/inject=<current-jaeger-instance> to a created common spec object. The annotation is merged with annotations from the CR which allows overriding the instance name e.g.:

apiVersion: jaegertracing.io/v1
kind: Jaeger
metadata:
  name: jaeger-tenant1
  namespace: rhosdt-tenant1
spec:
  strategy: production
  query:
    tracingEnabled: true
    annotations:
      sidecar.jaegertracing.io/inject: telemeter-jaeger
  storage:
    type: elasticsearch
    options:
      es:
        max-span-age: 168h # should match numberOfDays*24
    esIndexCleaner:
      enabled: true
      numberOfDays: 7
      schedule: "55 23 * * *"
    elasticsearch:
      nodeCount: 1

Signed-off-by: Pavol Loffay <[email protected]>
@codecov
Copy link

codecov bot commented Oct 4, 2021

Codecov Report

Merging #1569 (a08d96b) into master (c1e6ee1) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head a08d96b differs from pull request most recent head b484849. Consider uploading reports for the commit b484849 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1569      +/-   ##
==========================================
- Coverage   87.58%   87.58%   -0.01%     
==========================================
  Files          94       94              
  Lines        5954     5952       -2     
==========================================
- Hits         5215     5213       -2     
  Misses        562      562              
  Partials      177      177              
Impacted Files Coverage Δ
pkg/strategy/production.go 100.00% <ø> (ø)
pkg/controller/deployment/deployment_controller.go 53.79% <100.00%> (ø)
pkg/inject/sidecar.go 97.46% <100.00%> (ø)

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 c1e6ee1...b484849. Read the comment docs.

@rubenvp8510 rubenvp8510 merged commit a95ea91 into jaegertracing:master Oct 4, 2021
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.

2 participants