Refactor getting containers from docker in logs agent#3369
Closed
Refactor getting containers from docker in logs agent#3369
Conversation
achntrl
added
[deprecated] team/logs
component/logs
changelog/no-changelog
ajacquemot
reviewed
Apr 24, 2019
| containers, err := client.ContainerList(context.Background(), types.ContainerListOptions{ | ||
| Filters: args, | ||
| }) | ||
| du, err := docker.GetDockerUtil() |
Contributor
There was a problem hiding this comment.
nits: do we really need to allocate this all the time ?
ajacquemot
reviewed
Apr 24, 2019
| } | ||
| if len(containers) != 1 { | ||
| return types.Container{}, fmt.Errorf("no container matches id: %v", id) | ||
| container, err := du.Inspect(id, false) |
Contributor
There was a problem hiding this comment.
What does this false stands for ? Worth adding a comment I think
ajacquemot
reviewed
Apr 24, 2019
| if len(c.container.Name) == 0 { | ||
| return false | ||
| } | ||
| if re.MatchString(c.container.Name) { |
Contributor
There was a problem hiding this comment.
nits: we could return re.MatchString(c.container.Name)
ajacquemot
reviewed
Apr 24, 2019
| parts := strings.FieldsFunc(label, func(c rune) bool { | ||
| return c == ':' || c == '=' | ||
| }) | ||
| if c.container.Config == nil { |
Contributor
There was a problem hiding this comment.
I feel like it's easy to forget to do this check ..
ajacquemot
approved these changes
Apr 24, 2019
Contributor
ajacquemot
left a comment
ajacquemot
left a comment
There was a problem hiding this comment.
If this is tested, let's 🚢 it, feel free to take my nits into account.
Contributor
|
Are we getting this in for 6.12? Otherwise, please change the milestone to 6.13 🙂 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Refactor Refactor getting containers from docker in logs agent
follow up after #3367
Motivation
What inspired you to submit this pull request?
Additional Notes
Anything else we should know when reviewing?