diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index ff7c5f58..d8f97999 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -936,7 +936,7 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "21dd7eaeef6c" + "Rev": "12449b5492ee" }, { "ImportPath": "k8s.io/code-generator", diff --git a/go.mod b/go.mod index 1c98521c..911e4edb 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 984d76e4..c5707f48 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/cmd/patch/patch.go b/pkg/cmd/patch/patch.go index 9b0b540d..bd2ed51f 100644 --- a/pkg/cmd/patch/patch.go +++ b/pkg/cmd/patch/patch.go @@ -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)