github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Allow for returning map[string]interface{} from patch.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2016-12-30 11:19:22 +01:00
parent 8f99b74466
commit d08abdb187
6 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go
View File

@@ -111,10 +111,10 @@ func (nsu *nodeStatusUpdater) UpdateNodeStatuses() error {
}
patchBytes, err :=
strategicpatch.CreateStrategicMergePatch(oldData, newData, node)
strategicpatch.CreateTwoWayMergePatch(oldData, newData, node)
if err != nil {
return fmt.Errorf(
"failed to CreateStrategicMergePatch for node %q. %v",
"failed to CreateTwoWayMergePatch for node %q. %v",
nodeName,
err)
}