Per-app pid-file for multiple containers (#243)

OSC · May 14, 2024 · 0d0767b · 0d0767b
1 parent 6701fc6
commit 0d0767b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/webservice/Chart.yaml b/charts/webservice/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: webservice
 description: OSC webservice bootstrap Helm Chart
 type: application
-version: 0.34.3
+version: 0.34.4
 appVersion: "0.1.0"
 maintainers:
   - name: treydock

diff --git a/charts/webservice/templates/ingress.yaml b/charts/webservice/templates/ingress.yaml
@@ -3,7 +3,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ tpl $container.name $root }}
+  name: {{ include "webservice.name" $root }}-{{ tpl $container.name $root }}
   labels:
     {{- include "webservice.labels" $root | nindent 4 }}
   {{- if (include "webservice.alert.receiver" $root) }}

diff --git a/charts/webservice/values.yaml b/charts/webservice/values.yaml
@@ -26,7 +26,7 @@ defaultArgs:
     - "--disable-security-update-check"
     - "--disable-anonymous-telemetry"
     - "--log-file=/dev/stdout"
-    - "--pid-file=/tmp/passenger.pid"
+    - "--pid-file=/tmp/passenger-{{ .name }}.pid"
   rshiny:
     # Set by PASSENGER_PORT env var
     # - "--port={{ .Values.service.port }}"
@@ -37,7 +37,7 @@ defaultArgs:
     - "--disable-security-update-check"
     - "--disable-anonymous-telemetry"
     - "--log-file=/dev/stdout"
-    - "--pid-file=/tmp/passenger.pid"
+    - "--pid-file=/tmp/passenger-{{ .name }}.pid"
     - "--app-start-command"
     - '{{ index .startCommand | default "R --no-save --slave -f /app/entrypoint.R --args $$PORT" }}'
   none: []