UPSTREAM: <carry>: Override termination grace period on annotation

openshift-rebase(v1.24):source=b8796c6f7c3
openshift · Aug 22, 2022 · 026eeb5 · 026eeb5
1 parent fa28c1e
commit 026eeb5
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go
@@ -994,6 +994,13 @@ func setTerminationGracePeriod(pod *v1.Pod, containerSpec *v1.Container, contain
 		}
 		return *pod.Spec.TerminationGracePeriodSeconds
 	}
+
+	if annotationGracePeriod, found := pod.ObjectMeta.Annotations["unsupported.do-not-use.openshift.io/override-liveness-grace-period-seconds"]; found {
+		if val, err := strconv.ParseUint(annotationGracePeriod, 10, 64); err == nil && val > 0 {
+			gracePeriod = int64(val)
+		}
+	}
+
 	return gracePeriod
 }