Remove more docker references in kubelet #7586
Merged
Conversation
This file contains 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
This change also renames TrimRuntimePrefixFromImage to TrimRuntimePrefix to better reflect that the usage is not limited to images (e.g. ID).
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if len(dockerContainers) == 0 { | ||
| return nil, ErrNoKubeletContainers |
There was a problem hiding this comment.
I am unsure why we need to report ErrNoKubeletContainers, as opposed to ErrContainerNotFound. Do we really care about the difference? If that's the case, I would do more plumbing and change the behavior back to reporting ErrNoKubeletContainers
There was a problem hiding this comment.
I agree, ErrContainerNotFound sounds good. This was added since there was a request for concrete errors in server.go. The handling of both errors there is the same actually. If you're up for it we can probably remove ErrNoKubeletContainers. Feel free to do here or in another PR.
|
LGTM |
We no longer use it.
|
Add a new commit to remove |
|
LGTM, thanks @yujuhong! |
|
Shippable is green, merging. |
vmarmol
added a commit
that referenced
this pull request
Apr 30, 2015
Remove more docker references in kubelet
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change also renames TrimRuntimePrefixFromImage to TrimRuntimePrefix to
better reflect that the usage is not limited to images (e.g. ID).