Fix worker prestop cmd

leifcr · Oct 2, 2019 · 882cac7 · 882cac7
1 parent c28f83e
commit 882cac7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 description: GitLab Auto-deploy Helm Chart - Rails version
 name: auto-deploy-rails
-version: 0.3.1
+version: 0.3.2
 icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png
diff --git a/templates/worker-deployment.yaml b/templates/worker-deployment.yaml
@@ -43,10 +43,7 @@ spec:
         lifecycle:
           preStop:
             exec:
-              command:
-              {{- range .Values.worker.preStopCommand }}
-              - {{ . }}
-              {{- end }}
+              command: '{{ .Values.worker.preStopCommand }}'
         {{- end }}
         {{- if .Values.worker.sidekiq_alive.enabled }}
         livenessProbe:

diff --git a/values.yaml b/values.yaml
@@ -81,13 +81,7 @@ worker:
       timeoutSeconds: 5 # Can be less
       port: 7433
   # SIGTERM triggers a quick exit; gracefully terminate instead
-  preStopCommand:
-    - bundle
-    - exec
-    - sidekiqctl
-    - quiet
-    - /tmp/sidekiq.pid
-    - "0"
+  preStopCommand: 'bundle exec sidekiqcl sidekiqctl quiet /tmp/sidekiq.pid 0'
   resources: {}
   #  limits:
   #    cpu: 100m