Pull underlying capabilities up to 00-multus.conf #545
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
Pull Request Test Coverage Report for Build 195949001
💛 - Coveralls |
clementnuss
force-pushed
the
master
branch
2 times, most recently
from
f14bad4
to
9d5c91d
Compare
|
Sorry for the multiple Finally, I have reverted both commits and replaced them by a single one with a shorter commit message. |
Using Python, we analyze the content of the master plugin configuration, and we integrate any capabilities from the underlying chained plugins declaration. We only pull enabled capabilties from the underlying (chained) plugin definitions. Fixes intel#544 Signed-off-by: <Clement.Nussbaumer@Swisscom.com>
|
Thank you for your PR, @clementnuss ! It looks good to me. Let's wait a few days for other comments and merge it. |
dougbtv
approved these changes
Aug 6, 2020
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.
As discussed in issue #544 the nested plugin
capabilitiesare not integrated in the00-multus.conffile generated by theimages/entrypoint.shfile.I implemented the parsing of the underlying master plugin json configuration file with python, to retrieve the nested capabilities and to integrate them in the top-level section of the
00-multus.conffile (because it is not sufficient to have capabilities declared in thedelegatessection of the CNI config file.)The python script for analyzing underlying plugins capabilities is compatible with Python 2 and Python 3, it could be a bit shorter if I used only Python 3 syntax, but I noticed that the Dockerfile is based on a CentOS version that uses Phyton 2.
When no capabilities in the underlying plugins, then nothing gets added to the
00-multus.conffile.