kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87677 from jennybuckley/schema-error 

Make schema error log message more useful

Kubernetes-commit: 73409068cd35918fd4c2d4f4d9c422a64116da20
This commit is contained in:
Kubernetes Publisher 2020-01-30 05:06:56 -08:00
parent 63d2c07ac2 0fe6670327
commit dfd2b63452
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/endpoints/handlers/fieldmanager/structuredmerge.go
View File

@ -99,13 +99,13 @@ func (f *structuredMergeManager) Update(liveObj, newObj runtime.Object, managed
newObjTyped, err := f.typeConverter.ObjectToTyped(newObjVersioned)
if err != nil {
// Return newObj and just by-pass fields update. This really shouldn't happen.
klog.Errorf("[SHOULD NOT HAPPEN] failed to create typed new object: %v", err)
klog.Errorf("[SHOULD NOT HAPPEN] failed to create typed new object of type %v: %v", newObjVersioned.GetObjectKind().GroupVersionKind(), err)
return newObj, managed, nil
}
liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned)
if err != nil {
// Return newObj and just by-pass fields update. This really shouldn't happen.
klog.Errorf("[SHOULD NOT HAPPEN] failed to create typed live object: %v", err)
klog.Errorf("[SHOULD NOT HAPPEN] failed to create typed live object of type %v: %v", liveObjVersioned.GetObjectKind().GroupVersionKind(), err)
return newObj, managed, nil
}
apiVersion := fieldpath.APIVersion(f.groupVersion.String())