github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86501 from yutedz/crd-reuse-converter

Browse Source 
Reuse converter in crdHandler#getOrCreateServingInfoFor
This commit is contained in:
Kubernetes Prow Robot
2020-01-07 03:20:17 -08:00
committed by GitHub
parent 38173d586a a5f782face
commit a302f64cd3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
View File

@@ -654,11 +654,11 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
openAPIModels = nil openAPIModels = nil
} }
safeConverter, unsafeConverter, err := r.converterFactory.NewConverter(crd)
if err != nil {
return nil, err
}
for _, v := range crd.Spec.Versions { for _, v := range crd.Spec.Versions {
safeConverter, unsafeConverter, err := r.converterFactory.NewConverter(crd)
if err != nil {
return nil, err
}
// In addition to Unstructured objects (Custom Resources), we also may sometimes need to // In addition to Unstructured objects (Custom Resources), we also may sometimes need to
// decode unversioned Options objects, so we delegate to parameterScheme for such types. // decode unversioned Options objects, so we delegate to parameterScheme for such types.
parameterScheme := runtime.NewScheme() parameterScheme := runtime.NewScheme()