scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #113338 from apelisse/swagger-unmarshaljson

Browse Source 
Swagger unmarshaljson
This commit is contained in:
Kubernetes Prow Robot
2022-10-25 22:38:35 -07:00
committed by GitHub
parent bb12faf15b 5be7430fe3
commit d77d28b15f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/downloader.go
View File

@@ -22,7 +22,6 @@ import (
"net/http" "net/http"
"strings" "strings"
utiljson "k8s.io/apimachinery/pkg/util/json"
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/kube-openapi/pkg/validation/spec" "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 return nil, "", http.StatusNotFound, nil
case http.StatusOK: case http.StatusOK:
openAPISpec := &spec.Swagger{} openAPISpec := &spec.Swagger{}
if err := utiljson.Unmarshal(writer.data, openAPISpec); err != nil { if err := openAPISpec.UnmarshalJSON(writer.data); err != nil {
return nil, "", 0, err return nil, "", 0, err
} }
newEtag = writer.Header().Get("Etag") newEtag = writer.Header().Get("Etag")