From 5be7430fe3deb6fddd51c2d8406a2fe0f17cccc4 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Tue, 25 Oct 2022 10:51:19 -0700 Subject: [PATCH] Use Swagger#UnmarshalJSON rather than json.Unmarshal Since we're now using the experimental json code to deserialize spec.Swagger, we should rather use UnmarshalJSON since this has a much lower CPU overhead. --- .../pkg/controllers/openapi/aggregator/downloader.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/downloader.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/downloader.go index a6c50907e82..0a32b169ed4 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/downloader.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/downloader.go @@ -22,7 +22,6 @@ import ( "net/http" "strings" - utiljson "k8s.io/apimachinery/pkg/util/json" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kube-openapi/pkg/validation/spec" @@ -79,7 +78,7 @@ func (s *Downloader) Download(handler http.Handler, etag string) (returnSpec *sp return nil, "", http.StatusNotFound, nil case http.StatusOK: openAPISpec := &spec.Swagger{} - if err := utiljson.Unmarshal(writer.data, openAPISpec); err != nil { + if err := openAPISpec.UnmarshalJSON(writer.data); err != nil { return nil, "", 0, err } newEtag = writer.Header().Get("Etag")