From 09190bce3ebca877bea4e18515fde15355ec3821 Mon Sep 17 00:00:00 2001 From: Mamduh Alassi Date: Mon, 14 Dec 2020 10:29:08 +0200 Subject: [PATCH] Fix entrypoint fail to read capabilities in non chain plugin config 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 --- images/entrypoint.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/entrypoint.sh b/images/entrypoint.sh index fd2fa56d8..34d25ef1d 100755 --- a/images/entrypoint.sh +++ b/images/entrypoint.sh @@ -317,8 +317,11 @@ 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]: - capabilities.update({capability:enabled for (capability,enabled) in capa.items() if enabled}) +if 'plugins' in conf: + 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: print("""\"capabilities\": """ + json.dumps(capabilities) + ",") else: