github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

kubectl: fix error message for client-side SMP for CRs

Browse Source
This commit is contained in:
Nikhita Raghunath 2021-02-17 13:44:36 +05:30
parent 5ad3b34bde
commit a9a3e4d1c9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/kubectl/pkg/cmd/patch/patch.go
View File

@ -338,7 +338,7 @@ func getPatchedJSON(patchType types.PatchType, originalJS, patchJS []byte, gvk s
// get a typed object for this GVK if we need to apply a strategic merge patch // get a typed object for this GVK if we need to apply a strategic merge patch
obj, err := creater.New(gvk) obj, err := creater.New(gvk)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot apply strategic merge patch for %s locally, try --type merge", gvk.String()) return nil, fmt.Errorf("strategic merge patch is not supported for %s locally, try --type merge", gvk.String())
} }
return strategicpatch.StrategicMergePatch(originalJS, patchJS, obj) return strategicpatch.StrategicMergePatch(originalJS, patchJS, obj)