Merge pull request #16 from ethersphere/add-trap-init-script

add trap to catch SIGTERM and forward it to bee process
ethersphere · Jun 8, 2020 · 964bac5 · 964bac5
2 parents dee73e1 + eb6ab06
commit 964bac5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 appVersion: latest
 name: bee
-version: 0.3.1
+version: 0.3.2
 description: Ethereum Swarm Bee Helm chart for Kubernetes
 home: https://swarm.ethereum.org
 icon: https://swarm-guide.readthedocs.io/en/latest/_images/swarm.png

diff --git a/charts/bee/templates/statefulset.yaml b/charts/bee/templates/statefulset.yaml
@@ -65,10 +65,14 @@ spec:
             - bash
             - -ac
             - >
+              pid=;
+              trap '[[ $pid ]] && kill "$pid"' SIGTERM;
               if [ $(echo $(hostname) | rev | cut -d'-' -f 1 | rev) == 0 ]; then
-                bee start --config=.bee.yaml
+                bee start --config=.bee.yaml & pid=$!;
+                wait;
               else
-                bee start --config=.bee.yaml --bootnode=/ip4/${{ include "bee.fullname" . | upper | replace "-" "_" }}_0_P2P_SERVICE_HOST/tcp/7070/p2p/{{ .Values.bootnode.libp2p_underlay }}
+                bee start --config=.bee.yaml --bootnode=/ip4/${{ include "bee.fullname" . | upper | replace "-" "_" }}_0_P2P_SERVICE_HOST/tcp/7070/p2p/{{ .Values.bootnode.libp2p_underlay }} & pid=$!;
+                wait;
               fi;
             {{- else}}
             - bee