kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extract util used by jsonmergepatch and SMPatch

This commit is contained in:
ymqytw 2017-02-03 11:49:37 -08:00 committed by deads2k
parent ac15385364
commit 5598b36661
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/endpoints/handlers/rest.go
View File

@ -39,6 +39,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/mergepatch"
"k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
@ -658,7 +659,7 @@ func patchResource(
} }
} }
hasConflicts, err := strategicpatch.HasConflicts(originalPatchMap, currentPatchMap) hasConflicts, err := mergepatch.HasConflicts(originalPatchMap, currentPatchMap)
if err != nil { if err != nil {
return nil, err return nil, err
} }