fix(chart): use native stop signal when supported

Author: coffee-the-dev

charts/abstract-node/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: abstract-node
 description: External node for syncing and serving blockchain data for Abstract
-version: 0.1.41
+version: 0.1.42
 type: application
 icon: https://abstract-assets.abs.xyz/icons/light.png
 keywords:

charts/abstract-node/templates/_helpers.tpl

@@ -104,7 +104,9 @@ Render external node command / args, preserving the existing shutdown wrapper be
 {{- define "abstract-node.nodeArgs" -}}
 {{- $root := .root -}}
 {{- $args := default (list) .args -}}
-{{- if $root.Values.shutdownWrapper.enabled }}
+{{- $kubeVersion := $root.Capabilities.KubeVersion.Version | trimPrefix "v" -}}
+{{- $supportsStopSignal := semverCompare ">=1.33.0-0" $kubeVersion -}}
+{{- if and $root.Values.shutdownWrapper.enabled (not $supportsStopSignal) }}
 command:
   - /bin/sh
   - -ec

charts/abstract-node/templates/deployment-api.yaml

@@ -1,4 +1,6 @@
 {{- if .Values.ha.enabled }}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version | trimPrefix "v" -}}
+{{- $supportsStopSignal := semverCompare ">=1.33.0-0" $kubeVersion -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -45,13 +47,21 @@ spec:
     {{- end }}
     {{- if .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+    {{- end }}
+    {{- if $supportsStopSignal }}
+      os:
+        name: linux
     {{- end }}
       serviceAccountName: {{ include "common.names.serviceAccountName" . }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if $supportsStopSignal }}
+          lifecycle:
+            stopSignal: SIGINT
+          {{- end }}
           {{- $apiArgs := concat (list (printf "--components=%s" (include "abstract-node.haApiComponents" .))) .Values.ha.api.extraArgs }}
 {{ include "abstract-node.nodeArgs" (dict "root" . "args" $apiArgs) | nindent 10 }}
           env:

charts/abstract-node/templates/statefulset.yaml

@@ -1,3 +1,5 @@
+{{- $kubeVersion := .Capabilities.KubeVersion.Version | trimPrefix "v" -}}
+{{- $supportsStopSignal := semverCompare ">=1.33.0-0" $kubeVersion -}}
 ---
 apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
 kind: StatefulSet
@@ -52,6 +54,10 @@ spec:
     {{- end }}
     {{- if .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+    {{- end }}
+    {{- if $supportsStopSignal }}
+      os:
+        name: linux
     {{- end }}
       serviceAccountName: {{ include "common.names.serviceAccountName" . }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
@@ -78,6 +84,10 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if $supportsStopSignal }}
+          lifecycle:
+            stopSignal: SIGINT
+          {{- end }}
           {{- if .Values.ha.enabled }}
           {{- $coreArgs := concat (list (printf "--components=%s" (include "abstract-node.haCoreComponents" .))) .Values.ha.core.extraArgs }}
 {{ include "abstract-node.nodeArgs" (dict "root" . "args" $coreArgs) | nindent 10 }}

charts/abstract-node/values.yaml

@@ -153,7 +153,7 @@ serviceAccount:
 ## Termination Grace Period
 ## ref: https://kubernetes.io/docs/tasks/run-application/force-delete-stateful-set-pod/#delete-pods
 ##
-terminationGracePeriodSeconds: 300
+terminationGracePeriodSeconds: 30
 
 ## RBAC configuration.
 ## ref: https://kubernetes.io/docs/reference/access-authn-authz/rbac/