Skip to content

Commit 5262633

Browse files
authored
Merge pull request kubernetes#82266 from m3ngyang/time-since
replace time.Now().Sub with time.Since
2 parents 17246b8 + 0205215 commit 5262633

File tree

2 files changed

+4
-4
lines changed
  • staging/src/k8s.io
    • apiserver/pkg/server/options/encryptionconfig
    • kube-aggregator/pkg/controllers/openapi/aggregator

2 files changed

+4
-4
lines changed

staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func (h *kmsPluginProbe) Check() error {
135135
h.l.Lock()
136136
defer h.l.Unlock()
137137

138-
if (time.Now().Sub(h.lastResponse.received)) < kmsPluginHealthzTTL {
138+
if (time.Since(h.lastResponse.received)) < kmsPluginHealthzTTL {
139139
return h.lastResponse.err
140140
}
141141

staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server.
108108
// Build initial spec to serve.
109109
klog.V(2).Infof("Building initial OpenAPI spec")
110110
defer func(start time.Time) {
111-
duration := time.Now().Sub(start)
111+
duration := time.Since(start)
112112
klog.V(2).Infof("Finished initial OpenAPI spec generation after %v", duration)
113113

114114
regenerationCounter.With(map[string]string{"apiservice": "*", "reason": "startup"})
@@ -222,7 +222,7 @@ func (s *specAggregator) tryUpdatingServiceSpecs(specInfo *openAPISpecInfo) erro
222222
}
223223
klog.V(2).Infof("Updating OpenAPI spec because %s is updated", specInfo.apiService.Name)
224224
defer func(start time.Time) {
225-
duration := time.Now().Sub(start)
225+
duration := time.Since(start)
226226
klog.V(2).Infof("Finished OpenAPI spec generation after %v", duration)
227227

228228
reason := "add"
@@ -254,7 +254,7 @@ func (s *specAggregator) tryDeleteServiceSpecs(apiServiceName string) error {
254254
delete(s.openAPISpecs, apiServiceName)
255255
klog.V(2).Infof("Updating OpenAPI spec because %s is removed", apiServiceName)
256256
defer func(start time.Time) {
257-
duration := time.Now().Sub(start)
257+
duration := time.Since(start)
258258
klog.V(2).Infof("Finished OpenAPI spec generation after %v", duration)
259259

260260
regenerationCounter.With(map[string]string{"apiservice": apiServiceName, "reason": "delete"})

0 commit comments

Comments
 (0)