From f6ed21b3b774ca6c06678fa4e905b34a11732c78 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Tue, 4 Apr 2023 14:30:14 +0200 Subject: [PATCH] autoconf - fix global custom configs not supported in k8s/swarm mode --- src/autoconf/Config.py | 11 ++++++++--- src/autoconf/SwarmController.py | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/autoconf/Config.py b/src/autoconf/Config.py index d3f968010..c50934303 100644 --- a/src/autoconf/Config.py +++ b/src/autoconf/Config.py @@ -54,14 +54,19 @@ class Config(ConfigCaller): custom_configs = [] for config_type in self.__configs: for file, data in self.__configs[config_type].items(): - exploded = file.split("/") + site = None + name = file + if "/" in file : + exploded = file.split("/") + site = exploded[0] + name = exploded[1] custom_configs.append( { "value": data, "exploded": [ - exploded[0], + site, config_type, - exploded[1].replace(".conf", ""), + name.replace(".conf", ""), ], } ) diff --git a/src/autoconf/SwarmController.py b/src/autoconf/SwarmController.py index a167fa9d9..4f66ce8e2 100644 --- a/src/autoconf/SwarmController.py +++ b/src/autoconf/SwarmController.py @@ -98,6 +98,7 @@ class SwarmController(Controller, ConfigCaller): not config.name or not config.attrs or not config.attrs.get("Spec", {}).get("Labels", {}) + or not config.attrs.get("Spec", {}).get("Data", {}) ): continue