This repository was archived by the owner on Mar 9, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 348
Support CNI DNS capabilities. #1244
Merged
Random-Liu
merged 1 commit into
containerd:master
from
Random-Liu:support-cni-dns-capabilities
Aug 22, 2019
Merged
Support CNI DNS capabilities. #1244
Random-Liu
merged 1 commit into
containerd:master
from
Random-Liu:support-cni-dns-capabilities
Aug 22, 2019
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
531a004
to
203ffc9
Compare
jterry75
approved these changes
Aug 22, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
mikebrow
approved these changes
Aug 22, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/LGTM
just a couple small nits
pkg/server/sandbox_run.go
Outdated
} | ||
|
||
// Will return an error if the bandwidth limitation has the wrong unit | ||
// or an unreasonable valure see validateBandwidthIsReasonable() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/valure/value/
pkg/server/sandbox_run.go
Outdated
"IgnoreUnknown": "1", | ||
} | ||
} | ||
|
||
// toCNIBandWidth converts CRI annotations to CNI bandwidth. | ||
func toCNIBandWidth(annotations map[string]string) (*cni.BandWidth, error) { | ||
ingress, egress, err := bandwidth.ExtractPodBandwidthResources(annotations) | ||
if err != nil { | ||
return nil, errors.Errorf("reading pod bandwidth annotations: %v", err) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
errors.Wrap
Signed-off-by: Lantao Liu <[email protected]>
203ffc9
to
28aef2f
Compare
New changes are detected. LGTM label has been removed. |
Addressed @mikebrow's comment. Apply lgtm based on #1244 (review) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
For #1257.
Fixes #1243.
Depends on containerd/go-cni#48.
This is required for Windows container support as well. (See kubernetes/kubernetes#67435)
/cc @yujuhong
Signed-off-by: Lantao Liu [email protected]