mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #44600 from xingzhou/kube-44599
Automatic merge from submit-queue Fixed a tiny issue for ShortHumanDuration printer. Fixed a tiny issue for ShortHumanDuration printer to avoid "0y" message. Fixed #44599
This commit is contained in:
commit
22957509e7
@ -34,7 +34,7 @@ func ShortHumanDuration(d time.Duration) string {
|
||||
return fmt.Sprintf("%dm", minutes)
|
||||
} else if hours := int(d.Hours()); hours < 24 {
|
||||
return fmt.Sprintf("%dh", hours)
|
||||
} else if hours < 24*364 {
|
||||
} else if hours < 24*365 {
|
||||
return fmt.Sprintf("%dd", hours/24)
|
||||
}
|
||||
return fmt.Sprintf("%dy", int(d.Hours()/24/365))
|
||||
|
Loading…
Reference in New Issue
Block a user