Skip to content

Commit 912dd75

Browse files
authored
Merge pull request #374 from guzzijones/term
add pod graceful timeout override
2 parents 87425e0 + 078c286 commit 912dd75

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* Reduce duplication in label tests (#354) (by @cognifloyd)
1414
* Add `st2canary` job as a Helm Hook that runs before install/upgrade to ensure `st2.packs.volumes` is configured correctly (if `st2.packs.volumes.enabled`). (#323) (by @cognifloyd)
1515
* Enable using existing `st2-auth` secret. This allows users to manage this secret outside of the Helm process. (#359) (by @bmarick)
16+
* Add terminationGracePeriodSeconds to workflow and actionrunner pods to allow adjustment of grace period in k8 (#374) (by @guzzijones12)
1617
* Prevent duplicate init containers on helm upgrade (#375) (by @guzzijones12)
1718
* Fix st2 client config issue affecting addon jobs using jobs.extra_hooks (#370) (by @cars)
1819

19-
2020
## v0.110.0
2121
* Switch st2 to `v3.8` as a new default stable version (#347)
2222
* Cover the three most recent Kubernetes versions in Minikube and the single most recent in K3s. (#342) (by @mamercad)

templates/deployments.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,7 @@ spec:
753753
{{- toYaml .Values.st2workflowengine.annotations | nindent 8 }}
754754
{{- end }}
755755
spec:
756+
terminationGracePeriodSeconds: {{ .Values.st2workflowengine.terminationGracePeriodSeconds | default 300 }}
756757
imagePullSecrets:
757758
{{- if .Values.image.pullSecret }}
758759
- name: {{ .Values.image.pullSecret }}
@@ -1321,6 +1322,7 @@ spec:
13211322
{{- if and .Values.st2.packs.images (not .Values.st2.packs.volumes.enabled) }}
13221323
{{- include "stackstorm-ha.packs-initContainers" . | nindent 6 }}
13231324
{{- end }}
1325+
terminationGracePeriodSeconds: {{ .Values.st2actionrunner.terminationGracePeriodSeconds | default 300 }}
13241326
containers:
13251327
- name: st2actionrunner
13261328
{{- with .Values.st2actionrunner }}

values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,8 @@ st2timersengine:
563563
# https://docs.stackstorm.com/reference/ha.html#st2workflowengine
564564
# Multiple st2workflowengine processes can run in active-active mode and will share the load and pick up more work if one or more of the processes become available.
565565
st2workflowengine:
566+
# k8 pod timeout. set this to a few seconds longer than st2 config workflow_engine.exit_still_active_check
567+
terminationGracePeriodSeconds: 300
566568
replicas: 2
567569
resources:
568570
requests:
@@ -657,6 +659,9 @@ st2notifier:
657659
# Multiple st2actionrunner processes can run in active-active with only connections to MongoDB and RabbitMQ. Work gets naturally
658660
# distributed across runners via RabbitMQ. Adding more st2actionrunner processes increases the ability of StackStorm to execute actions.
659661
st2actionrunner:
662+
# k8 pod timeout. set this to a few seconds longer than st2 config actionrunner.exit_still_active_check and set
663+
# actionrunner.graceful_shutdown = True
664+
terminationGracePeriodSeconds: 300
660665
replicas: 5
661666
resources:
662667
requests:

0 commit comments

Comments
 (0)