From 523b4c0918fee5859bd811fce5ab5dfdac04a4f3 Mon Sep 17 00:00:00 2001 From: tanjing2020 Date: Fri, 23 Jul 2021 10:03:36 +0800 Subject: [PATCH] Replace 'x.Sub(time.Now())' with 'time.Until(x)' --- cmd/kubelet/app/server.go | 2 +- pkg/kubelet/certificate/kubelet.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 34bac9c53a9..7f11a0ff6f7 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -892,7 +892,7 @@ func buildKubeletClientConfig(ctx context.Context, s *options.KubeletServer, nod }, func() float64 { if c := clientCertificateManager.Current(); c != nil && c.Leaf != nil { - return math.Trunc(c.Leaf.NotAfter.Sub(time.Now()).Seconds()) + return math.Trunc(time.Until(c.Leaf.NotAfter).Seconds()) } return math.Inf(1) }, diff --git a/pkg/kubelet/certificate/kubelet.go b/pkg/kubelet/certificate/kubelet.go index af2d21717dc..61f34191d10 100644 --- a/pkg/kubelet/certificate/kubelet.go +++ b/pkg/kubelet/certificate/kubelet.go @@ -141,7 +141,7 @@ func NewKubeletServerCertificateManager(kubeClient clientset.Interface, kubeCfg }, func() float64 { if c := m.Current(); c != nil && c.Leaf != nil { - return math.Trunc(c.Leaf.NotAfter.Sub(time.Now()).Seconds()) + return math.Trunc(time.Until(c.Leaf.NotAfter).Seconds()) } return math.Inf(1) },