feat(heimdall): dumb-init to avoid leftover zombies

graphops · Oct 18, 2024 · 74a037c · 74a037c
1 parent 9c1a246
commit 74a037c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/charts/heimdall/Chart.yaml b/charts/heimdall/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.2.4
+version: 1.2.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/heimdall/README.md b/charts/heimdall/README.md
@@ -2,7 +2,7 @@
 
 Deploy and scale [Heimdall](https://github.com/maticnetwork/heimdall) inside Kubernetes with ease
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 1.2.4](https://img.shields.io/badge/Version-1.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.10](https://img.shields.io/badge/AppVersion-1.0.10-informational?style=flat-square)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 1.2.5](https://img.shields.io/badge/Version-1.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.10](https://img.shields.io/badge/AppVersion-1.0.10-informational?style=flat-square)
 
 ## Features
 

diff --git a/charts/heimdall/templates/heimdall/statefulset.yaml b/charts/heimdall/templates/heimdall/statefulset.yaml
@@ -63,13 +63,15 @@ spec:
             - -c
             - |
               set -ex
-
+              apk update && apk add --no-cache dumb-init
+              mv /usr/bin/dumb-init /storage/dumb-init
+              chmod +x /storage/dumb-init
               HEIMDALLD_HOME="/storage"
 
               # If config hasn't been boostrapped already, do it
               if [ ! -f "$HEIMDALLD_HOME/config/config.toml" ]; then
                 # Write out init config for Heimdall
-                heimdalld --home $HEIMDALLD_HOME init
+                exec /storage/dumb-init -- heimdalld --home $HEIMDALLD_HOME init
               fi
 
               # Replace init genesis with desired network genesis
@@ -139,7 +141,7 @@ spec:
             - -c
             - |
               set -x
-              exec heimdalld start \
+              exec /storage/dumb-init -- heimdalld start \
                 {{- range $val := initial $heimdallArgs }}
                 {{ $val }} \
                 {{- end }}
@@ -206,7 +208,7 @@ spec:
             - -c
             - |
               set -x;
-              exec heimdalld rest-server \
+              exec /storage/dumb-init -- heimdalld rest-server \
                 {{- range $val := initial $heimdallRestArgs }}
                 {{ $val }} \
                 {{- end }}

diff --git a/charts/heimdall/values.yaml b/charts/heimdall/values.yaml
@@ -88,7 +88,7 @@ heimdall:
   volumeClaimSpec:
     accessModes: ["ReadWriteOnce"]
     # -- The storage class to use when provisioning a persistent volume for heimdall
-    storageClassName: 
+    storageClassName:
     resources:
       requests:
         # -- The amount of disk space to provision for Heimdall