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

OpenShift-Rebase-Source: c56aa0b
openshift · Dec 20, 2022 · da7b822 · da7b822
1 parent 8b266b9
commit da7b822
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go
@@ -999,6 +999,11 @@ func setTerminationGracePeriod(pod *v1.Pod, containerSpec *v1.Container, contain
 				return *containerSpec.LivenessProbe.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 {
+				return int64(val)
+			}
+		}
 		return *pod.Spec.TerminationGracePeriodSeconds
 	}
 	return gracePeriod