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.

Sign up for GitHub

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

Jump to bottom

support CNI RuntimeConfig for Mac #105

Merged
merged 1 commit into from
Oct 15, 2019
Merged

support CNI RuntimeConfig for Mac #105

merged 1 commit into from
Oct 15, 2019

Conversation

zshi-redhat
Copy link
Collaborator

CNI RuntimeConfig takes preference if configured,
envArgs can still be used for Mac configuration if
meta plugin(Multus) passes Mac as envArgs.

Fixes #104

@zshi-redhat zshi-redhat mentioned this pull request Oct 11, 2019
Merged
@ahalimx86
Copy link
Collaborator

@zshi-redhat, Thanks for the quick implementation! Are we going to keep both configs for good or are we planning to deprecate the "args" option later? Not sure if this will require us to keep a version compatibility matrix with Multus.

@zshi-redhat
Copy link
Collaborator Author

@zshi-redhat, Thanks for the quick implementation! Are we going to keep both configs for good or are we planning to deprecate the "args" option later? Not sure if this will require us to keep a version compatibility matrix with Multus.

Hi @ahalim-intel thanks for the comments! I was thinking in the coming release, keep both configs be supported, and deprecate the envArgs once Multus doesn't support it (this may happen in next release). so that we will have one version that works for both cases, and next versions that only work with runtimeConfig, wdyt ?

@zshi-redhat
support CNI RuntimeConfig for Mac
70a10af 
CNI RuntimeConfig takes preference if configured,
envArgs can still be used for Mac configuration if
meta plugin(Multus) passes Mac as envArgs.

Fixes k8snetworkplumbingwg#104
@zshi-redhat
Copy link
Collaborator Author

conflict resolved.

ahalimx86
ahalimx86 approved these changes Oct 15, 2019
View reviewed changes
Copy link
Collaborator

@ahalimx86 ahalimx86 left a comment

Choose a reason for hiding this comment

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

/lgtm

@ahalimx86 ahalimx86 merged commit c9e13c3 into k8snetworkplumbingwg:master Oct 15, 2019
krsacme pushed a commit to krsacme/sriov-cni that referenced this pull request Aug 25, 2020
@zshi-redhat
support CNI RuntimeConfig for Mac (k8snetworkplumbingwg#105)
20441b5 
CNI RuntimeConfig takes preference if configured,
envArgs can still be used for Mac configuration if
meta plugin(Multus) passes Mac as envArgs.

Fixes k8snetworkplumbingwg#104
thom311 pushed a commit to thom311/k8snetworkplumbingwg-sriov-cni that referenced this pull request Jun 3, 2024
@openshift-merge-bot
Merge pull request k8snetworkplumbingwg#105 from SchSeba/snyk-master
d9ccc6a 
add Snyk
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahalimx86 ahalimx86 ahalimx86 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

support CNI runtimeConfig for Mac configuration
2 participants
@zshi-redhat @ahalimx86