From 75210763bd955733a9f755ee738b1355b57001cd Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 27 Sep 2018 15:12:04 -0700 Subject: [PATCH] kubectl replaced reference to internal version of Deployment with external version --- pkg/kubectl/cmd/BUILD | 1 - pkg/kubectl/cmd/apply_test.go | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index b8ffc63d33..38221baeb8 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -192,7 +192,6 @@ go_test( "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/core:go_default_library", - "//pkg/apis/extensions:go_default_library", "//pkg/kubectl/cmd/create:go_default_library", "//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", diff --git a/pkg/kubectl/cmd/apply_test.go b/pkg/kubectl/cmd/apply_test.go index 66628eadf6..dfa119eddd 100644 --- a/pkg/kubectl/cmd/apply_test.go +++ b/pkg/kubectl/cmd/apply_test.go @@ -32,6 +32,7 @@ import ( "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" kubeerr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -44,7 +45,6 @@ import ( "k8s.io/client-go/rest/fake" clienttesting "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/apis/extensions" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" @@ -852,11 +852,12 @@ const ( func readDeploymentFromFile(t *testing.T, file string) []byte { raw := readBytesFromFile(t, file) - obj := &extensions.Deployment{} - if err := runtime.DecodeInto(testapi.Extensions.Codec(), raw, obj); err != nil { + obj := &extensionsv1beta1.Deployment{} + codec := scheme.Codecs.LegacyCodec(extensionsv1beta1.SchemeGroupVersion) + if err := runtime.DecodeInto(codec, raw, obj); err != nil { t.Fatal(err) } - objJSON, err := runtime.Encode(testapi.Extensions.Codec(), obj) + objJSON, err := runtime.Encode(codec, obj) if err != nil { t.Fatal(err) }