mirror of
https://github.com/k8snetworkplumbingwg/multus-cni.git
synced 2025-07-11 06:33:04 +00:00
Merge pull request #595 from Mmduh-483/capabilities-entry-fail
Fix entrypoint fail to read capabilities in non chain plugin config
This commit is contained in:
commit
bd9f2e9700
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user