From 696734a772e438e290bdf6e3191af7f39b968cc1 Mon Sep 17 00:00:00 2001 From: Haiwei Li Date: Tue, 5 Nov 2019 17:20:34 +0800 Subject: [PATCH] use time.Until instead of t.Sub(time.Now()) --- cmd/kubeadm/app/cmd/token.go | 2 +- cmd/kubeadm/app/phases/certs/renewal/expiration.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index cd87235afff..84d3b874100 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -287,7 +287,7 @@ func formatBootstrapToken(obj *outputapiv1alpha1.BootstrapToken) string { ttl := "" expires := "" 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) diff --git a/cmd/kubeadm/app/phases/certs/renewal/expiration.go b/cmd/kubeadm/app/phases/certs/renewal/expiration.go index dc6b81e0960..fe96ab2e025 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/expiration.go +++ b/cmd/kubeadm/app/phases/certs/renewal/expiration.go @@ -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) }