Merge branch '2.4.x' into main

Closes gh-26701
spring-projects · May 28, 2021 · 54c3194 · 54c3194
2 parents b8b0430 + 5314bda
commit 54c3194
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc
@@ -17,4 +17,4 @@ include::deployment/cloud.adoc[]
 
 include::deployment/installing.adoc[]
 
-include::deployment/whats-next.adoc[]
+include::deployment/whats-next.adoc[]
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/cloud.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/cloud.adoc
@@ -138,6 +138,10 @@ The preStop handler can be configured via the PodSpec in the pod's configuration
 
 Once the pre-stop hook has completed, SIGTERM will be sent to the container and <<features#features.graceful-shutdown,graceful shutdown>> will begin, allowing any remaining in-flight requests to complete.
 
+NOTE: When Kubernetes sends a SIGTERM signal to the pod, it waits for a specified time called the termination grace period (the default for which is 30 seconds).
+If the containers are still running after the grace period, they are sent the SIGKILL signal and forcibly removed.
+If the pod takes longer than 30 seconds to shut down, which could be because you've increased spring.lifecycle.timeout-per-shutdown-phase, make sure to increase the termination grace period by setting the `terminationGracePeriodSeconds` option in the Pod YAML.
+
 
 
 [[deployment.cloud.heroku]]