github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 13:57:38 +00:00
Code Issues Projects Releases Wiki Activity

fix toleration of FieldManager errors

Browse Source 
We were updating the object to nil, so even though we tolerate errors,
we were creating errors further down the process.
This commit is contained in:
Antoine Pelisse
2018-12-18 14:10:35 -08:00
parent 00dd33d333
commit fd342b5faa
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go
View File

@@ -304,8 +304,9 @@ func (p *jsonPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (r
}
if p.fieldManager != nil {
objToUpdate, err = p.fieldManager.Update(currentObject, objToUpdate, "jsonPatcher")
if err != nil {
if obj, err := p.fieldManager.Update(currentObject, objToUpdate, "jsonPatcher"); err == nil {
objToUpdate = obj
} else {
klog.Warningf("FieldManager: Failed to update object managed fields: %v", err)
}
}
@@ -367,8 +368,9 @@ func (p *smpPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (ru
}
if p.fieldManager != nil {
newObj, err = p.fieldManager.Update(currentObject, newObj, "smPatcher")
if err != nil {
if obj, err := p.fieldManager.Update(currentObject, newObj, "smPatcher"); err == nil {
newObj = obj
} else {
klog.Warningf("FieldManager: Failed to update object managed fields: %v", err)
}
}