Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autoconf - various kubernetes fixes

Browse Source
This commit is contained in:
bunkerity
2021-08-13 16:42:31 +02:00
parent c9a6b6c27d
commit f1d5c07cc1
9 changed files with 180 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoconf/src/IngressController.py
View File

@@ -86,7 +86,7 @@ class IngressController(Controller.Controller) :
for service in services :
if service.metadata.annotations != None and "bunkerized-nginx.SERVER_NAME" in service.metadata.annotations :
env.update(self.__annotations_to_env(service.metadata.annotations))
first_servers.append(service.metadata.annotations["SERVER_NAME"])
first_servers.append(service.metadata.annotations["bunkerized-nginx.SERVER_NAME"])
first_servers = list(dict.fromkeys(first_servers))
if len(first_servers) == 0 :
env["SERVER_NAME"] = ""
@@ -181,9 +181,11 @@ class IngressController(Controller.Controller) :
# Generate first config
env = self.get_env()
if not self.gen_conf(env) :
self.lock.release()
return False, env
# Wait for bunkerized-nginx
self.lock.release()
return self._config.wait(services), env
except :
pass

6
autoconf/src/SwarmController.py
View File

@@ -56,8 +56,8 @@ class SwarmController(Controller.Controller) :
log("controller", "ERROR", "failed reload")
else :
log("controller", "ERROR", "can't generate new configuration")
except :
log("controller", "ERROR", "exception while receiving event")
except :
log("controller", "ERROR", "exception while receiving event")
self.lock.release()
def reload(self) :
@@ -74,8 +74,10 @@ class SwarmController(Controller.Controller) :
# Generate first config
env = self.get_env()
if not self.gen_conf(env) :
self.lock.release()
return False, env
# Wait for nginx
self.lock.release()
return self._config.wait(instances), env
except :
pass