diff --git a/pkg/kinflate/transformers/overlay.go b/pkg/kinflate/transformers/overlay.go index 3294a9a51..636dd72b0 100644 --- a/pkg/kinflate/transformers/overlay.go +++ b/pkg/kinflate/transformers/overlay.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/strategicpatch" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubectl/pkg/kinflate/resource" - "k8s.io/kubectl/pkg/scheme" ) // overlayTransformer contains a map of overlay objects diff --git a/pkg/scheme/scheme.go b/pkg/scheme/scheme.go deleted file mode 100644 index db36a8aad..000000000 --- a/pkg/scheme/scheme.go +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2017 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 scheme - -import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/kubernetes/scheme" -) - -// Scheme is the default instance of runtime.Scheme to which types in the Kubernetes API are already registered. -var Scheme = runtime.NewScheme() - -func init() { - // Register external types for Scheme - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - scheme.AddToScheme(Scheme) -}