This repository has been archived by the owner on Feb 24, 2020. It is now read-only.
networking: apply CNI args to the default networks as well #2985
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
| // We don't do this earlier because we also load networks in other contexts | ||
| for _, n := range nets { | ||
| n.runtime.Args = e.netsLoadList.SpecificArgs(n.conf.Name) | ||
| } |
There was a problem hiding this comment.
0.02$: I would've inserted a newline here
|
Please add a test for this functionality for
and checks if that IP has actually been allocated. |
squeed
force-pushed
the
cni-default-plugin-args
branch
from
8df0654
to
16bb179
Compare
|
Tests done - ready for review ( @steveej ) |
|
|
||
| func TestNetIPConflict(t *testing.T) { | ||
| NewNetIPConflictTest().Execute(t) | ||
| } |
There was a problem hiding this comment.
Same tests imo should be added into rkt_net_kvm_test.go
|
These tests are only for first mentioned by @steveej bullet, but IMO they look really good. |
squeed
force-pushed
the
cni-default-plugin-args
branch
from
16bb179
to
bc077ba
Compare
|
@jellonek We already tested the non-default-network case before this PR. So we should have everything covered. |
|
Ack, but what about |
|
Ack. LGTM. |
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.
Fixes #2980