Fix entrypoint fail to read capabilities in non chain plugin config #595
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 420577740
💛 - Coveralls |
images/entrypoint.sh
Outdated
| @@ -317,7 +317,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then | |||
| import json,sys | |||
| conf = json.load(sys.stdin) | |||
| capabilities = {} | |||
| for capa in [p['capabilities'] for p in conf['plugins'] if 'capabilities' in p]: | |||
| for capa in [p['capabilities'] for p in conf.get('plugins', []) if 'capabilities' in p]: | |||
There was a problem hiding this comment.
So, to my understanding this bit of code is used to get the list of capabilities the master plugin supports.
Shouldn't we support the case where the master plugin is not specified as a configuration list ?
Current proposed change will ignore capabilities if master plugin is specified in a non configuration list manner.
There was a problem hiding this comment.
Updated to cover master plugin
entrypoint script fails with error when try reading capabilities in non chain plugin config file when using "--multus-conf-file=auto" Signed-off-by: Mamduh Alassi <mamduhala@mellanox.com>
Mmduh-483
force-pushed
the
capabilities-entry-fail
branch
from
4df2bb5
to
09190bc
Compare
adrianchiris
approved these changes
Dec 14, 2020
|
@Mmduh-483 💯 Thanks for picking this one up!! |
dougbtv
approved these changes
Dec 14, 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.
entrypoint script fails with error when try reading capabilities in
non chain plugin config file when using "--multus-conf-file=auto"
Fixes #594