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

Sync OTEL config volume/mount and args #1268

Conversation

jpkrohling
Copy link
Contributor

Fixes #1266

Signed-off-by: Juraci Paixão Kröhling juraci@kroehling.de

@codecov
Copy link

codecov bot commented Oct 20, 2020

Codecov Report

Merging #1268 into master will increase coverage by 0.05%.
The diff coverage is 88.23%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1268      +/-   ##
==========================================
+ Coverage   87.38%   87.43%   +0.05%     
==========================================
  Files          90       90              
  Lines        4913     4933      +20     
==========================================
+ Hits         4293     4313      +20     
  Misses        457      457              
  Partials      163      163              
Impacted Files Coverage Δ
pkg/deployment/agent.go 96.21% <50.00%> (ø)
pkg/deployment/collector.go 96.50% <50.00%> (ø)
pkg/deployment/ingester.go 95.90% <50.00%> (ø)
pkg/inject/sidecar.go 94.14% <50.00%> (ø)
pkg/config/otelconfig/otelconfig.go 83.83% <100.00%> (+4.09%) ⬆️
pkg/deployment/all_in_one.go 100.00% <100.00%> (ø)
pkg/apis/jaegertracing/v1/jaeger_types.go 100.00% <0.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 3d15e00...90fbd87. Read the comment docs.

@dackroyd
Copy link

This has addressed the duplicate volume/volumeMount with the agent, which allows the agent to be updated correctly.

With the current implementation in this PR, the volume and volumeMount can never be removed once they have been created, i.e if the config needs to be removed at a later stage, the volume/volumeMount will not be removed (since they are merged in from the operator spec)

@jpkrohling jpkrohling force-pushed the jpkrohling/1266-duplicate-otel-config-volume branch from be890eb to 03fc0de Compare October 21, 2020 10:04
Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
@jpkrohling jpkrohling force-pushed the jpkrohling/1266-duplicate-otel-config-volume branch from 03fc0de to 7f61502 Compare October 21, 2020 10:07
@jpkrohling jpkrohling changed the title Prevent duplicate OTEL config volume/mount Sync OTEL config volume/mount and args Oct 21, 2020
@jpkrohling
Copy link
Contributor Author

@dackroyd, this should now address the case where the OTEL configuration is removed (or an external file is now specified). An updated image was published at the same location, in case you want to give this a try: quay.io/jpkroehling/jaeger-operator:pr1268.

pkg/config/otelconfig/otelconfig_test.go Outdated Show resolved Hide resolved
pkg/config/otelconfig/otelconfig_test.go Outdated Show resolved Hide resolved
pkg/config/otelconfig/otelconfig_test.go Outdated Show resolved Hide resolved
Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
@mergify mergify bot merged commit 8b07b3f into jaegertracing:master Oct 22, 2020
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.

OTel agent/collector failing with duplicate volume/volumeMount
4 participants