Skip to content

Commit 7a1a310

Browse files
authored
Fix/pod deletion timeout (#305)
* Fix pod deletion timeout, using TerminationGracePeriodSeconds instead of DeletionGracePeriodSeconds * Upgrade chart to 3.1.0-rc.2
1 parent dcf87a0 commit 7a1a310

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

controllers/instance_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,11 +618,11 @@ func CheckEvictionSupport(clientset kubernetes.Interface) (string, error) {
618618

619619
// deleteTimeout compute the delete timeout from given pods.
620620
func deleteTimeout(pods []kcore_v1.Pod) time.Duration {
621-
// We return the max DeletionGracePeriodSeconds from pods with
621+
// We return the max TerminationGracePeriodSeconds from pods with
622622
// a 30sec overhead.
623623
maxGrace := int64(30)
624624
for _, e := range pods {
625-
if grace := e.DeletionGracePeriodSeconds; grace != nil {
625+
if grace := e.Spec.TerminationGracePeriodSeconds; grace != nil {
626626
if *grace > maxGrace {
627627
maxGrace = *grace
628628
}

helm/kubestitute/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
name: kubestitute
33
type: application
4-
version: 3.1.0-rc.1
5-
appVersion: "2.3.0-rc.1"
4+
version: 3.1.0-rc.2
5+
appVersion: "2.3.0-rc.2"
66
description: Kubestitute is an event based instances lifecycle manager for Kubernetes.
77
home: https://github.com/quortex/kubestitute
88
sources:

helm/kubestitute/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# kubestitute
22

3-
![Version: 3.1.0-rc.1](https://img.shields.io/badge/Version-3.1.0--rc.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0-rc.1](https://img.shields.io/badge/AppVersion-2.3.0--rc.1-informational?style=flat-square)
3+
![Version: 3.1.0-rc.2](https://img.shields.io/badge/Version-3.1.0--rc.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0-rc.2](https://img.shields.io/badge/AppVersion-2.3.0--rc.2-informational?style=flat-square)
44

55
Kubestitute is an event based instances lifecycle manager for Kubernetes.
66

0 commit comments

Comments
 (0)