From fc58be6a9393621691baa769a642f833628447d2 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Mon, 17 Jun 2019 15:26:46 -0500 Subject: [PATCH] Ingress: Clean prometheus-nginx.socket on startup This PS cleans the prometheus-nginx.socket on startup of the container, which is required to allow the container, as opposed to the pod, restart. Change-Id: I7906e85a200f6fb92467371218b4e5957add39f4 Signed-off-by: Pete Birley --- ingress/templates/bin/_ingress-controller.sh.tpl | 1 + mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl | 1 + 2 files changed, 2 insertions(+) diff --git a/ingress/templates/bin/_ingress-controller.sh.tpl b/ingress/templates/bin/_ingress-controller.sh.tpl index c8ac04986..550c57c51 100644 --- a/ingress/templates/bin/_ingress-controller.sh.tpl +++ b/ingress/templates/bin/_ingress-controller.sh.tpl @@ -20,6 +20,7 @@ set -ex COMMAND="${@:-start}" function start () { + rm -fv /tmp/prometheus-nginx.socket exec /usr/bin/dumb-init \ /nginx-ingress-controller \ {{- if eq .Values.deployment.mode "namespace" }} diff --git a/mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl b/mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl index af6e0c0c7..4b3d47b6d 100644 --- a/mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl +++ b/mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl @@ -20,6 +20,7 @@ set -ex COMMAND="${@:-start}" function start () { + rm -fv /tmp/prometheus-nginx.socket exec /usr/bin/dumb-init \ /nginx-ingress-controller \ --force-namespace-isolation \