github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84781 from Gerry-Lee/UseTimeUtilInsteadOfTimeSub

Browse Source 
Use time.Until instead of t.Sub(time.Now())
This commit is contained in:
Kubernetes Prow Robot 2019-11-05 22:18:43 -08:00 committed by GitHub
commit 17874d6db3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/token.go
View File

@ -287,7 +287,7 @@ func formatBootstrapToken(obj *outputapiv1alpha1.BootstrapToken) string {
ttl := "<forever>"
expires := "<never>"
if obj.Expires != nil {
ttl = duration.ShortHumanDuration(obj.Expires.Sub(time.Now()))
ttl = duration.ShortHumanDuration(time.Until(obj.Expires.Time))
expires = obj.Expires.Format(time.RFC3339)
}
ttl = fmt.Sprintf("%-9s", ttl)

2
cmd/kubeadm/app/phases/certs/renewal/expiration.go
View File

@ -48,5 +48,5 @@ func newExpirationInfo(name string, cert *x509.Certificate, externallyManaged bo
// ResidualTime returns the time missing to expiration
func (e *ExpirationInfo) ResidualTime() time.Duration {
return e.ExpirationDate.Sub(time.Now())
return time.Until(e.ExpirationDate)
}