From b1675717168826c3314bf5b7e28c282f9643eadf Mon Sep 17 00:00:00 2001 From: wojtekt Date: Thu, 22 Aug 2019 08:58:45 +0200 Subject: [PATCH] Remove dead code --- .../pkg/registry/customresource/etcd_test.go | 25 +------ .../k8s.io/client-go/deprecated-dynamic/BUILD | 3 - .../client-go/deprecated-dynamic/bad_debt.go | 73 ------------------- .../deprecated-dynamic/client_test.go | 3 +- 4 files changed, 3 insertions(+), 101 deletions(-) delete mode 100644 staging/src/k8s.io/client-go/deprecated-dynamic/bad_debt.go diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/etcd_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/etcd_test.go index a2f96570820..bbf5c9c742e 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/etcd_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/etcd_test.go @@ -17,7 +17,6 @@ limitations under the License. package customresource_test import ( - "io" "reflect" "strings" "testing" @@ -48,7 +47,7 @@ import ( func newStorage(t *testing.T) (customresource.CustomResourceStorage, *etcd3testing.EtcdTestServer) { server, etcdStorage := etcd3testing.NewUnsecuredEtcd3TestClientServer(t) - etcdStorage.Codec = unstructuredJsonCodec{} + etcdStorage.Codec = unstructured.UnstructuredJSONScheme restOptions := generic.RESTOptions{StorageConfig: etcdStorage, Decorator: generic.UndecoratedStorage, DeleteCollectionWorkers: 1, ResourcePrefix: "noxus"} parameterScheme := runtime.NewScheme() @@ -527,28 +526,6 @@ func TestScaleUpdateWithoutSpecReplicas(t *testing.T) { } } -type unstructuredJsonCodec struct{} - -func (c unstructuredJsonCodec) Decode(data []byte, defaults *schema.GroupVersionKind, into runtime.Object) (runtime.Object, *schema.GroupVersionKind, error) { - obj := into.(*unstructured.Unstructured) - err := obj.UnmarshalJSON(data) - if err != nil { - return nil, nil, err - } - gvk := obj.GroupVersionKind() - return obj, &gvk, nil -} - -func (c unstructuredJsonCodec) Encode(obj runtime.Object, w io.Writer) error { - u := obj.(*unstructured.Unstructured) - bs, err := u.MarshalJSON() - if err != nil { - return err - } - w.Write(bs) - return nil -} - func setSpecReplicas(u *unstructured.Unstructured, replicas int64) { setNestedField(u, replicas, "spec", "replicas") } diff --git a/staging/src/k8s.io/client-go/deprecated-dynamic/BUILD b/staging/src/k8s.io/client-go/deprecated-dynamic/BUILD index 9b19a854f10..4ce83f632d9 100644 --- a/staging/src/k8s.io/client-go/deprecated-dynamic/BUILD +++ b/staging/src/k8s.io/client-go/deprecated-dynamic/BUILD @@ -3,7 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = [ - "bad_debt.go", "client.go", "client_pool.go", ], @@ -16,11 +15,9 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", - "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", ], ) diff --git a/staging/src/k8s.io/client-go/deprecated-dynamic/bad_debt.go b/staging/src/k8s.io/client-go/deprecated-dynamic/bad_debt.go deleted file mode 100644 index 7478b49b9aa..00000000000 --- a/staging/src/k8s.io/client-go/deprecated-dynamic/bad_debt.go +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package deprecated_dynamic - -import ( - "encoding/json" - "io" - "strings" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" -) - -// dynamicCodec is a codec that wraps the standard unstructured codec -// with special handling for Status objects. -// Deprecated only used by test code and its wrong -type dynamicCodec struct{} - -func (dynamicCodec) Decode(data []byte, gvk *schema.GroupVersionKind, obj runtime.Object) (runtime.Object, *schema.GroupVersionKind, error) { - obj, gvk, err := unstructured.UnstructuredJSONScheme.Decode(data, gvk, obj) - if err != nil { - return nil, nil, err - } - - if _, ok := obj.(*metav1.Status); !ok && strings.ToLower(gvk.Kind) == "status" { - obj = &metav1.Status{} - err := json.Unmarshal(data, obj) - if err != nil { - return nil, nil, err - } - } - - return obj, gvk, nil -} - -func (dynamicCodec) Encode(obj runtime.Object, w io.Writer) error { - return unstructured.UnstructuredJSONScheme.Encode(obj, w) -} - -// ContentConfig returns a rest.ContentConfig for dynamic types. -// Deprecated only used by test code and its wrong -func ContentConfig() rest.ContentConfig { - // TODO: scheme.Codecs here should become "pkg/apis/server/scheme" which is the minimal core you need - // to talk to a kubernetes server - jsonInfo, _ := runtime.SerializerInfoForMediaType(scheme.Codecs.SupportedMediaTypes(), runtime.ContentTypeJSON) - - jsonInfo.Serializer = dynamicCodec{} - jsonInfo.PrettySerializer = nil - return rest.ContentConfig{ - AcceptContentTypes: runtime.ContentTypeJSON, - ContentType: runtime.ContentTypeJSON, - NegotiatedSerializer: serializer.NegotiatedSerializerWrapper(jsonInfo), - } -} diff --git a/staging/src/k8s.io/client-go/deprecated-dynamic/client_test.go b/staging/src/k8s.io/client-go/deprecated-dynamic/client_test.go index 790474522a9..de88edb5422 100644 --- a/staging/src/k8s.io/client-go/deprecated-dynamic/client_test.go +++ b/staging/src/k8s.io/client-go/deprecated-dynamic/client_test.go @@ -511,7 +511,8 @@ func TestWatch(t *testing.T) { t.Errorf("Watch(%q) got query %s. wanted %s", tc.name, r.URL.RawQuery, tc.query) } - enc := restclientwatch.NewEncoder(streaming.NewEncoder(w, dynamicCodec{}), dynamicCodec{}) + codec := unstructured.UnstructuredJSONScheme + enc := restclientwatch.NewEncoder(streaming.NewEncoder(w, codec), codec) for _, e := range tc.events { enc.Encode(&e) }