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

Merge pull request #99143 from nikhita/cr-smp-msg 

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

Kubernetes-commit: 6dba3f205dbe65b8f7404ea358f34b29bc75b068
This commit is contained in:
Kubernetes Publisher 2021-02-18 19:04:44 -08:00
parent 0486eb21c7 75f0d51ce1
commit c51087c550
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -936,7 +936,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "21dd7eaeef6c"
"Rev": "12449b5492ee"
},
{
"ImportPath": "k8s.io/code-generator",

4
go.mod
View File

@ -37,7 +37,7 @@ require (
k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6
k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe
k8s.io/cli-runtime v0.0.0-20210217222438-5dae1b234a43
k8s.io/client-go v0.0.0-20210217213328-21dd7eaeef6c
k8s.io/client-go v0.0.0-20210219052155-12449b5492ee
k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3
k8s.io/component-helpers v0.0.0-20210217012858-e20ca0433831
k8s.io/klog/v2 v2.5.0
@ -52,7 +52,7 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210217222438-5dae1b234a43
k8s.io/client-go => k8s.io/client-go v0.0.0-20210217213328-21dd7eaeef6c
k8s.io/client-go => k8s.io/client-go v0.0.0-20210219052155-12449b5492ee
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210217003918-5a6947c9f285
k8s.io/component-base => k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210217012858-e20ca0433831

2
go.sum
View File

@ -627,7 +627,7 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78=
k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY=
k8s.io/cli-runtime v0.0.0-20210217222438-5dae1b234a43/go.mod h1:iMyecOoB0p2BUHXHKs6c0elbq/BVQYazlvwURVfjtkM=
k8s.io/client-go v0.0.0-20210217213328-21dd7eaeef6c/go.mod h1:q0EaghmVye2uui19vxSZ2NG6ssgUWgjudO6vrwXneSI=
k8s.io/client-go v0.0.0-20210219052155-12449b5492ee/go.mod h1:VGRl84/71eS0xitGML6HKUOweoHe0JXXz0WOkwRBqtc=
k8s.io/code-generator v0.0.0-20210217003918-5a6947c9f285/go.mod h1:O7FXIFFMbeLstjVDD1gKtnexuIo2JF8jkudWpXyjVeo=
k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3/go.mod h1:gazbxECw90jDRTaMRWKvkWJtQMg8JkZmQTWfUAvL5gQ=
k8s.io/component-helpers v0.0.0-20210217012858-e20ca0433831/go.mod h1:d+uhC9mFJUgZ9GoIJudMvsp9RDQuhSG6sWFqS5eH3cU=

2
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
obj, err := creater.New(gvk)
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)