diff --git a/connaisseur/__main__.py b/connaisseur/__main__.py index 303f4aef3..4e05ade4e 100644 --- a/connaisseur/__main__.py +++ b/connaisseur/__main__.py @@ -13,6 +13,9 @@ from connaisseur.logging import ConnaisseurLoggingWrapper if __name__ == "__main__": + # allow nested asyncio loops + nest_asyncio.apply() + LOG_LEVEL = os.environ.get("LOG_LEVEL", "INFO") dictConfig( @@ -36,9 +39,6 @@ certificate="/app/certs/tls.crt", private_key="/app/certs/tls.key" ) - # allow nested asyncio loops - nest_asyncio.apply() - # wrap Connaisseur with a layer that logs HTTP requests app = ConnaisseurLoggingWrapper(APP, LOG_LEVEL) diff --git a/connaisseur/flask_application.py b/connaisseur/flask_application.py index f07b4e51a..8c4ebeba2 100644 --- a/connaisseur/flask_application.py +++ b/connaisseur/flask_application.py @@ -24,12 +24,6 @@ """ CONFIG = Config() -""" -Initiating and setting an event loop, -""" -loop = asyncio.new_event_loop() -asyncio.set_event_loop(loop) - metrics = PrometheusMetrics( APP, defaults_prefix=NO_PREFIX, @@ -70,7 +64,7 @@ def mutate(): Handle the '/mutate' path and accept CREATE and UPDATE requests. Send a response back, which either denies or allows the request. """ - result = loop.run_until_complete(__async_mutate()) + result = asyncio.get_event_loop().run_until_complete(__async_mutate()) return result diff --git a/tests/integration/integration-test.sh b/tests/integration/integration-test.sh index 1db2109d7..f6d30cfd4 100755 --- a/tests/integration/integration-test.sh +++ b/tests/integration/integration-test.sh @@ -14,7 +14,7 @@ TIMEOUT=30 RETRY=3 ## Backup helm/values.yaml -cp helm/values.yaml values.yaml.Backup +cp helm/values.yaml values.yaml.backup ## LOAD PUBLIC KEY COSIGN_PUBLIC_KEY="$(printf -- "${COSIGN_PUBLIC_KEY//
/\\n }")" @@ -607,5 +607,6 @@ fi echo 'Cleaning up installation and test resources...' make uninstall >/dev/null 2>&1 || true kubectl delete all,cronjobs,daemonsets,jobs,replicationcontrollers,statefulsets,namespaces -luse="connaisseur-integration-test" -A >/dev/null +rm ghcr-values ghcr-validator mv values.yaml.backup helm/values.yaml echo 'Finished cleanup.'