diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/create.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/create.go index f8c2dd4c34..cd95727fde 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/create.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/create.go @@ -137,13 +137,13 @@ func createHandler(r rest.NamedCreater, scope RequestScope, admit admission.Inte if scope.FieldManager != nil { liveObj, err := scope.Creater.New(scope.Kind) if err != nil { - scope.err(fmt.Errorf("failed to create new object: %v", err), w, req) + scope.err(fmt.Errorf("failed to create new object (Create for %v): %v", scope.Kind, err), w, req) return } obj, err = scope.FieldManager.Update(liveObj, obj, prefixFromUserAgent(req.UserAgent())) if err != nil { - scope.err(fmt.Errorf("failed to update object managed fields: %v", err), w, req) + scope.err(fmt.Errorf("failed to update object (Create for %v) managed fields: %v", scope.Kind, err), w, req) return } } diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go index 2d0d5f0807..dd41e93eb9 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go @@ -312,7 +312,7 @@ func (p *jsonPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (r if p.fieldManager != nil { if objToUpdate, err = p.fieldManager.Update(currentObject, objToUpdate, prefixFromUserAgent(p.userAgent)); err != nil { - return nil, fmt.Errorf("failed to update object managed fields: %v", err) + return nil, fmt.Errorf("failed to update object (json PATCH for %v) managed fields: %v", p.kind, err) } } return objToUpdate, nil @@ -374,7 +374,7 @@ func (p *smpPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (ru if p.fieldManager != nil { if newObj, err = p.fieldManager.Update(currentObject, newObj, prefixFromUserAgent(p.userAgent)); err != nil { - return nil, fmt.Errorf("failed to update object managed fields: %v", err) + return nil, fmt.Errorf("failed to update object (smp PATCH for %v) managed fields: %v", p.kind, err) } } return newObj, nil diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/update.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/update.go index a57e913d5b..4e0c17559f 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/update.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/update.go @@ -125,7 +125,7 @@ func UpdateResource(r rest.Updater, scope RequestScope, admit admission.Interfac if scope.FieldManager != nil { transformers = append(transformers, func(_ context.Context, newObj, liveObj runtime.Object) (runtime.Object, error) { if obj, err = scope.FieldManager.Update(liveObj, newObj, prefixFromUserAgent(req.UserAgent())); err != nil { - return nil, fmt.Errorf("failed to update object managed fields: %v", err) + return nil, fmt.Errorf("failed to update object (Update for %v) managed fields: %v", scope.Kind, err) } return obj, nil })