scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move pkg/kubectl/cmd/util and subdirs to staging

Browse Source
This commit is contained in:
Sean Sullivan
2019-07-28 21:29:36 -07:00
parent 3be827e912
commit 6c96a059dd
169 changed files with 201 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/patch/patch.go
View File

@@ -36,10 +36,10 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/cli-runtime/pkg/resource"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
)
var patchTypes = map[string]types.PatchType{"json": types.JSONPatchType, "merge": types.MergePatchType, "strategic": types.StrategicMergePatchType}