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.

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

static: prioritize the input sources for IPs #400

Merged
merged 1 commit into from
Oct 23, 2019

Conversation

s1061123
Copy link
Contributor

This change introduce priorities for IPs input among CNI_ARGS, 'args' and runtimeConfig.
Fix #399

Signed-off-by: Tomofumi Hayashi tohayash@redhat.com

@s1061123 s1061123 force-pushed the fix/overwrite-ips branch 2 times, most recently from 3d381c3 to ec6abcb Compare October 13, 2019 08:27
plugins/ipam/static/README.md Outdated Show resolved Hide resolved
plugins/ipam/static/main.go Show resolved Hide resolved
@squeed
Copy link
Member

squeed commented Oct 16, 2019

Can you add some tests for this? Thanks!

This change introduce priorities for IPs input among CNI_ARGS,
'args' and runtimeConfig. Fix containernetworking#399.

Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com>
@s1061123
Copy link
Contributor Author

@squeed thank you for your comment! I added a testcase.

@bboreham
Copy link
Contributor

Am I right in thinking there was a priority order before, and this PR changes the ordering?
Just wanted to check how we announce this in release notes, etc.

Copy link
Contributor

@bboreham bboreham left a comment

Choose a reason for hiding this comment

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

lgtm

@squeed
Copy link
Member

squeed commented Oct 23, 2019

Given that this is a (small) change in behavior, we should probably bump the version when we next do a release.

@squeed squeed merged commit a162329 into containernetworking:master Oct 23, 2019
@s1061123 s1061123 deleted the fix/overwrite-ips branch October 24, 2019 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

static: prioritize between runtimeConfig, CNI_ARGS and json "args"
5 participants