From 9dd672d21a79168c97aeb8d402ef1daed6ce460f Mon Sep 17 00:00:00 2001 From: Marco Donadoni Date: Wed, 20 Sep 2023 16:41:32 +0200 Subject: [PATCH] helm: fix graceful shutdown for reana-server Avoid using `/bin/sh -c` to run uwsgi, as that breaks signal propagation. Closes reanahub/reana-job-controller#347 --- CHANGES.rst | 1 + helm/reana/templates/reana-server.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index d3413213..07210b1b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -17,6 +17,7 @@ Version 0.9.1 (UNRELEASED) - Fixes uWSGI memory consumption on systems with very high allowed number of open files. - Fixes cronjob failures due to database connection issues when REANA is deployed with non-default namespace or prefix. - Fixes ``ingress.enabled`` option to correctly enable or disable the creation of Ingresses. + - Fixes graceful shutdown for reana-server and reana-workflow-controller. - Adds new configuration options ``login`` and ``secrets.login`` for configuring Keycloak SSO login with third-party authentication services. - Developers: - Fixes ``cluster-deploy``, ``cluster-undeploy`` and ``client-setup-environment`` commands when using custom instance name or kubernetes namespace. diff --git a/helm/reana/templates/reana-server.yaml b/helm/reana/templates/reana-server.yaml index 4724554c..82d4449e 100644 --- a/helm/reana/templates/reana-server.yaml +++ b/helm/reana/templates/reana-server.yaml @@ -43,8 +43,8 @@ spec: tty: true stdin: true {{- else }} - command: ["/bin/sh", "-c"] - args: ["uwsgi --ini /var/reana/uwsgi/uwsgi.ini"] + # do not use "/bin/sh -c" here as that breaks signal propagation + command: ["uwsgi", "--ini", "/var/reana/uwsgi/uwsgi.ini"] {{- end }} volumeMounts: {{- if .Values.debug.enabled }}