mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-21 22:49:31 +00:00
5f55fd21cc
Automatic merge from submit-queue (batch tested with PRs 65993, 65986, 65351, 65996, 65985). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix DeletionTimestamp printing **What this PR does / why we need it**: I found a bug that `ObjectMeta.DeletionTimestamp` is not displayed correctly because it's a future time but it uses the time difference until now. So I fixed it by calculating the time difference from now instead of until now. Before this fix: ``` Name: test-pod-7bd594bd96-hf5kk Namespace: default Node: kube-node-2/10.192.0.4 Start Time: Fri, 22 Jun 2018 14:57:09 +0900 Labels: pod-template-hash=3681506852 run=test-pod Annotations: <none> Status: Terminating (lasts <invalid>) Termination Grace Period: 30s IP: 10.244.3.5 Controlled By: ReplicaSet/test-pod-7bd594bd96 Containers: ... ``` After this fix: ``` Name: test-pod-7bd594bd96-85cdd Namespace: default Node: kube-node-2/10.192.0.4 Start Time: Fri, 22 Jun 2018 14:56:44 +0900 Labels: pod-template-hash=3681506852 run=test-pod Annotations: <none> Status: Terminating (lasts 2m) Termination Grace Period: 123s IP: 10.244.3.4 Controlled By: ReplicaSet/test-pod-7bd594bd96 ... ``` Could you consider merging it? We heavily use preemptible jobs in my company and knowing deletion time and grace periods is really important when jobs trap `SIGTERM` and decide if it should continue to run until the deletion time or just stop immediately. **Which issue(s) this PR fixes** N/A **Special notes for your reviewer**: N/A **Release note**: ```release-note NONE ```