Skip to content

Commit 0a1c57d

Browse files
authored
fix(apps): KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS is now also per app (#486)
1 parent 9e70ab2 commit 0a1c57d

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/applications/deploying-apps.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,11 @@ Setting | Description
6363
DEIS_DEPLOY_BATCHES | the number of pods to bring up and take down sequentially during a scale (default: number of available nodes)
6464
DEIS_DEPLOY_TIMEOUT | deploy timeout in seconds per deploy batch (default: 120)
6565
KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT | how many [revisions][kubernetes-deployment-revision] Kubernetes keeps around of a given Deployment (default: all revisions)
66+
KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS | how many seconds kubernetes waits for a pod to finish work after a SIGTERM before sending SIGKILL (default: 30)
6667

6768
### Deploy Timeout
6869

69-
Deploy timeout in seconds - There are 2 deploy methods, current (RC) and Deployments (see below) and this setting affects those a bit differently.
70-
71-
#### RC deploy
72-
73-
This deploy timeout defines how long to wait for each batch to complete in `DEIS_DEPLOY_BATCHES`
70+
Deploy timeout in seconds - There are 2 deploy methods, Deployments (see below) and RC (versions prior to 2.4) and this setting affects those a bit differently.
7471

7572
#### Deployments
7673

@@ -80,6 +77,10 @@ Kubernetes takes care of the entire deploy, doing rolling updates in the backgro
8077

8178
The base timeout is multiplied with `DEIS_DEPLOY_BATCHES` to create an overall timeout. This would be 240 (timeout) * 4 (batches) = 960 second overall timeout.
8279

80+
#### RC deploy
81+
82+
This deploy timeout defines how long to wait for each batch to complete in `DEIS_DEPLOY_BATCHES`.
83+
8384
#### Additions to the base timeout
8485

8586
The base timeout is extended as well with healthchecks using `initialDelaySeconds` on `liveness` and `readiness` where the bigger of those two is applied.

src/managing-workflow/tuning-component-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ RESERVED_NAMES | a comma-separated list of name
5656
SLUGRUNNER_IMAGE_NAME | the image used to run buildpack application slugs (default: "quay.io/deisci/slugrunner:canary")
5757
SLUG_BUILDER_IMAGE_PULL_POLICY | the kubernetes [image pull policy][pull-policy] for slugbuilder (default: "Always")
5858
DOCKER_BUILDER_IMAGE_PULL_POLICY | the kubernetes [image pull policy][pull-policy] for dockerbuilder (default: "Always")
59-
KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS | how many seconds kubernetes waits for a pod to finish work after a SIGTERM before sending SIGKILL (default: 30)
6059

6160
### Global and per application settings
6261

@@ -65,6 +64,7 @@ Setting | Description
6564
DEIS_DEPLOY_BATCHES | the number of pods to bring up and take down sequentially during a scale (default: number of available nodes)
6665
DEIS_DEPLOY_TIMEOUT | deploy timeout in seconds per deploy batch (default: 120)
6766
KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT | how many [revisions][[kubernetes-deployment-revision]] Kubernetes keeps around of a given Deployment (default: all revisions)
67+
KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS | how many seconds kubernetes waits for a pod to finish work after a SIGTERM before sending SIGKILL (default: 30)
6868

6969
See the [Deploying Apps][] guide for more detailed information on those.
7070

0 commit comments

Comments
 (0)