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.

Sign up for GitHub

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

Jump to bottom

Auto-inject agent tags in multi-container pods #864

Merged
merged 3 commits into from
Jan 28, 2020
Merged

Auto-inject agent tags in multi-container pods #864

merged 3 commits into from
Jan 28, 2020

Conversation

TBBle
Copy link
Contributor

@TBBle TBBle commented Jan 19, 2020 •
edited
Loading

Fixes: #863

@TBBle TBBle marked this pull request as ready for review January 19, 2020 22:43
objectiser
objectiser reviewed Jan 20, 2020
View reviewed changes
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.

Thanks for reporting the issue - would you be able to add a couple of tests, one with single container showing the container.name tag and another with multiple containers showing that is the only missing tag?

@TBBle TBBle mentioned this pull request Jan 22, 2020
Closed
@TBBle TBBle requested a review from objectiser January 24, 2020 05:59
@jpkrohling jpkrohling mentioned this pull request Jan 24, 2020
Merged
jpkrohling
jpkrohling reviewed Jan 24, 2020
View reviewed changes
Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

Almost there! There are a couple of comments, but I could test the main code and it works as expected.

pkg/inject/sidecar_test.go Outdated Show resolved Hide resolved
pkg/inject/sidecar_test.go Outdated Show resolved Hide resolved
pkg/inject/sidecar_test.go Outdated Show resolved Hide resolved
@jpkrohling jpkrohling mentioned this pull request Jan 27, 2020
Closed
Paul "Hampy" Hampson added 3 commits January 28, 2020 20:55
Auto-inject agent tags in multi-container pods
8b4bb13 
Fixes: #863

Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net>
Add test for container.name Agent Tag
304e49e 
Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net>
Test for agent tags with two non-agent containers
64417b0 
Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net>
@TBBle TBBle requested a review from jpkrohling January 28, 2020 10:24
jpkrohling
jpkrohling approved these changes Jan 28, 2020
View reviewed changes
Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

LGTM

@jpkrohling jpkrohling merged commit d1dd263 into jaegertracing:master Jan 28, 2020
@jpkrohling
Copy link
Contributor

Thanks for your PR!

@TBBle TBBle deleted the include_pod_tags_for_multi-container_pods branch January 28, 2020 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpkrohling jpkrohling jpkrohling approved these changes

@objectiser objectiser Awaiting requested review from objectiser

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Jaeger tags for injected agent are only added if a single container is present
3 participants
@TBBle @jpkrohling @objectiser