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

extract util used by jsonmergepatch and SMPatch

Browse Source
This commit is contained in:
ymqytw
2017-02-03 11:49:37 -08:00
parent ab794c6128
commit a910284e17
13 changed files with 351 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/util/jsonmerge/jsonmerge.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/evanphx/json-patch"
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apimachinery/pkg/util/mergepatch"
"k8s.io/apimachinery/pkg/util/yaml"
)
@@ -161,7 +161,7 @@ func (d *Delta) Apply(latest []byte) ([]byte, error) {
}
glog.V(6).Infof("Testing for conflict between:\n%s\n%s", string(d.edit), string(changes))
hasConflicts, err := strategicpatch.HasConflicts(diff1, diff2)
hasConflicts, err := mergepatch.HasConflicts(diff1, diff2)
if err != nil {
return nil, err
}