mirror of
https://github.com/kubernetes/client-go.git
synced 2025-07-12 06:28:33 +00:00
Merge pull request #66967 from deads2k/kubectl-09-naughty
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. stop adding internal types to external schemes at some point someone starting internal types to external schemes in kubectl tests. This fixes that mistake. @kubernetes/sig-cli-maintainers /assign @soltysh ```release-note NONE ``` Kubernetes-commit: dab04dc6e0103c1778f047594e5405d433cff96c
This commit is contained in:
commit
02384dbe12
102
Godeps/Godeps.json
generated
102
Godeps/Godeps.json
generated
@ -396,207 +396,207 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
|
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
|
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
|
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
|
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
|
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
|
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
|
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
|
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
|
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
|
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
|
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
|
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
|
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/fields",
|
"ImportPath": "k8s.io/apimachinery/pkg/fields",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/labels",
|
"ImportPath": "k8s.io/apimachinery/pkg/labels",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
|
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
|
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
|
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
|
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
|
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
|
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
|
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/selection",
|
"ImportPath": "k8s.io/apimachinery/pkg/selection",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/types",
|
"ImportPath": "k8s.io/apimachinery/pkg/types",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
|
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/version",
|
"ImportPath": "k8s.io/apimachinery/pkg/version",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/pkg/watch",
|
"ImportPath": "k8s.io/apimachinery/pkg/watch",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
|
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
|
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
|
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
|
||||||
"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
|
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
|
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
|
||||||
|
@ -94,14 +94,10 @@ func (c *RESTClient) request(verb string) *restclient.Request {
|
|||||||
|
|
||||||
ns := c.NegotiatedSerializer
|
ns := c.NegotiatedSerializer
|
||||||
info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
|
info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
|
||||||
internalVersion := schema.GroupVersion{
|
|
||||||
Group: c.GroupVersion.Group,
|
|
||||||
Version: runtime.APIVersionInternal,
|
|
||||||
}
|
|
||||||
serializers := restclient.Serializers{
|
serializers := restclient.Serializers{
|
||||||
// TODO this was hardcoded before, but it doesn't look right
|
// TODO this was hardcoded before, but it doesn't look right
|
||||||
Encoder: ns.EncoderForVersion(info.Serializer, c.GroupVersion),
|
Encoder: ns.EncoderForVersion(info.Serializer, c.GroupVersion),
|
||||||
Decoder: ns.DecoderToVersion(info.Serializer, internalVersion),
|
Decoder: ns.DecoderToVersion(info.Serializer, c.GroupVersion),
|
||||||
}
|
}
|
||||||
if info.StreamSerializer != nil {
|
if info.StreamSerializer != nil {
|
||||||
serializers.StreamingSerializer = info.StreamSerializer.Serializer
|
serializers.StreamingSerializer = info.StreamSerializer.Serializer
|
||||||
|
Loading…
Reference in New Issue
Block a user