github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
parent 7c2bfc0dda 696734a772
commit 17874d6db3
2 changed files with 2 additions and 2 deletions
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>" ttl := "<forever>"
expires := "<never>" expires := "<never>"
if obj.Expires != nil { 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) expires = obj.Expires.Format(time.RFC3339)
} }
ttl = fmt.Sprintf("%-9s", ttl) 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 // ResidualTime returns the time missing to expiration
func (e *ExpirationInfo) ResidualTime() time.Duration { func (e *ExpirationInfo) ResidualTime() time.Duration {
return e.ExpirationDate.Sub(time.Now()) return time.Until(e.ExpirationDate)
} }