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

Merge pull request #4766 from mikedanese/remove-util-merge

Browse Source 
Remove pkg/util/merge and replace with evanphx/json-patch
This commit is contained in:
Brian Grant
2015-02-25 09:22:01 -08:00
parent e152c6710b 88e1ab3cbe
commit 3f69112e02
11 changed files with 1411 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/cmd/util/helpers.go
View File

@@ -28,7 +28,8 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/merge"
"github.com/evanphx/json-patch"
"github.com/golang/glog"
"github.com/spf13/cobra"
)
@@ -167,7 +168,7 @@ func Merge(dst runtime.Object, fragment, kind string) (runtime.Object, error) {
if err != nil {
return nil, err
}
patched, err := merge.MergeJSON(target, []byte(fragment))
patched, err := jsonpatch.MergePatch(target, []byte(fragment))
if err != nil {
return nil, err
}