github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Make schema error log message more useful

Browse Source
This commit is contained in:
jennybuckley 2020-01-29 15:01:44 -08:00 committed by Jennifer Buckley
parent dba8d60f8c
commit fee77388c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/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) newObjTyped, err := f.typeConverter.ObjectToTyped(newObjVersioned)
if err != nil { if err != nil {
// Return newObj and just by-pass fields update. This really shouldn't happen. // 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 return newObj, managed, nil
} }
liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned) liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned)
if err != nil { if err != nil {
// Return newObj and just by-pass fields update. This really shouldn't happen. // 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 return newObj, managed, nil
} }
apiVersion := fieldpath.APIVersion(f.groupVersion.String()) apiVersion := fieldpath.APIVersion(f.groupVersion.String())