From cf235c244f161c190b895aa8aa6ed1eadea6bf93 Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 12 Dec 2017 11:36:57 -0500 Subject: [PATCH] UPSTREAM: : switch apply to use the legacyscheme so our types can be handled --- vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply.go index 3c39f61998b3..6dd2a891d618 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply.go @@ -38,6 +38,7 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/util/wait" oapi "k8s.io/kube-openapi/pkg/util/proto" + "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/kubectl" @@ -45,7 +46,6 @@ import ( cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" "k8s.io/kubernetes/pkg/kubectl/resource" - "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) @@ -621,7 +621,7 @@ func (p *patcher) patchSimple(obj runtime.Object, modified []byte, source, names if patch == nil { // Create the versioned struct from the type defined in the restmapping // (which is the API version we'll be submitting the patch to) - versionedObject, err := scheme.Scheme.New(p.mapping.GroupVersionKind) + versionedObject, err := legacyscheme.Scheme.New(p.mapping.GroupVersionKind) switch { case runtime.IsNotRegisteredError(err): // fall back to generic JSON merge patch