github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-28 21:04:03 +00:00
Code Issues Projects Releases Wiki Activity

added previously failing unit test and fix using pkg/util/merge.go instead of mergo to apply patch.

Browse Source
This commit is contained in:
Mike Danese
2015-01-31 10:59:08 -08:00
parent 3039f7846c
commit a4eca69e6c
5 changed files with 95 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubectl/cmd/update.go
View File

@@ -116,12 +116,13 @@ func updateWithPatch(cmd *cobra.Command, args []string, f *Factory, patch string
obj, err := helper.Get(namespace, name)
checkErr(err)
cmdutil.Merge(obj, patch, mapping.Kind)
data, err := helper.Codec.Encode(obj)
patchedObj, err := cmdutil.Merge(obj, patch, mapping.Kind)
checkErr(err)
obj, err = helper.Update(namespace, name, true, data)
data, err := helper.Codec.Encode(patchedObj)
checkErr(err)
_, err = helper.Update(namespace, name, true, data)
checkErr(err)
return name
}