github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-07-11 06:33:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #595 from Mmduh-483/capabilities-entry-fail

Browse Source 
Fix entrypoint fail to read capabilities in non chain plugin config
This commit is contained in:
Doug Smith 2020-12-14 08:28:41 -05:00 committed by GitHub
commit bd9f2e9700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
images/entrypoint.sh
View File

@ -317,8 +317,11 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then
import json,sys import json,sys
conf = json.load(sys.stdin) conf = json.load(sys.stdin)
capabilities = {} capabilities = {}
for capa in [p['capabilities'] for p in conf['plugins'] if 'capabilities' in p]: if 'plugins' in conf:
capabilities.update({capability:enabled for (capability,enabled) in capa.items() if enabled}) for capa in [p['capabilities'] for p in conf['plugins'] if 'capabilities' in p]:
capabilities.update({capability:enabled for (capability,enabled) in capa.items() if enabled})
elif 'capabilities' in conf:
capabilities.update({capability:enabled for (capability,enabled) in conf['capabilities'] if enabled})
if len(capabilities) > 0: if len(capabilities) > 0:
print("""\"capabilities\": """ + json.dumps(capabilities) + ",") print("""\"capabilities\": """ + json.dumps(capabilities) + ",")
else: else: