Fix liveness probe to use bash and debian pgrep

SumoLogic · Aug 6, 2019 · 0fda44e · 0fda44e
1 parent 7904648
commit 0fda44e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
@@ -3,8 +3,7 @@ FROM fluent/fluentd:v1.6.3-debian-1.0
 # Use root account to use apt
 USER root
 
-# below RUN includes plugin as examples elasticsearch is not required
-# you may customize including plugins as you wish
+# Build dependencies
 RUN buildDeps="sudo make gcc g++ libc-dev ruby-dev libsnappy-dev" \
  && apt-get update \
  && apt-get install -y --no-install-recommends $buildDeps

diff --git a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl
@@ -326,17 +326,17 @@ spec:
         livenessProbe:
           exec:
             command:
-            - "/bin/sh"
+            - "/bin/bash"
             - "-c"
-            - "[[ $( pgrep ruby | wc -l)  == 2 ]]"
+            - "[[ $( pgrep ruby | wc -l)  > 0 ]]"
           initialDelaySeconds: 300
           periodSeconds: 20
         readinessProbe:
           exec:
             command:
-            - "/bin/sh"
+            - "/bin/bash"
             - "-c"
-            - "[[ $( pgrep ruby | wc -l)  == 2 ]]"
+            - "[[ $( pgrep ruby | wc -l)  > 0 ]]"
           initialDelaySeconds: 30
           periodSeconds: 5
         volumeMounts:
@@ -511,17 +511,17 @@ spec:
         livenessProbe:
           exec:
             command:
-            - "/bin/sh"
+            - "/bin/bash"
             - "-c"
-            - "[[ $( pgrep ruby | wc -l)  == 2 ]]"
+            - "[[ $( pgrep ruby | wc -l)  > 0 ]]"
           initialDelaySeconds: 300
           periodSeconds: 20
         readinessProbe:
           exec:
             command:
-            - "/bin/sh"
+            - "/bin/bash"
             - "-c"
-            - "[[ $( pgrep ruby | wc -l)  == 2 ]]"
+            - "[[ $( pgrep ruby | wc -l)  > 0 ]]"
           initialDelaySeconds: 30
           periodSeconds: 5
         env: