Merge pull request #80754 from seans3/move-restclient-staging

Move pkg/kubectl/interfaces.go to testing
This commit is contained in:
Kubernetes Prow Robot 2019-07-30 22:44:59 -07:00 committed by GitHub
commit eae7790f6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions

View File

@ -42,7 +42,6 @@ go_library(
srcs = [ srcs = [
"conditions.go", "conditions.go",
"doc.go", "doc.go",
"interfaces.go",
"rolling_updater.go", "rolling_updater.go",
"scale.go", "scale.go",
], ],
@ -55,12 +54,10 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime: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/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library",
"//staging/src/k8s.io/client-go/util/retry:go_default_library", "//staging/src/k8s.io/client-go/util/retry:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library",

View File

@ -4,13 +4,13 @@ go_library(
name = "go_default_library", name = "go_default_library",
srcs = [ srcs = [
"fake.go", "fake.go",
"interfaces.go",
"util.go", "util.go",
"zz_generated.deepcopy.go", "zz_generated.deepcopy.go",
], ],
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/testing", importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/testing",
visibility = ["//build/visible_to:pkg_kubectl_cmd_testing_CONSUMERS"], visibility = ["//build/visible_to:pkg_kubectl_cmd_testing_CONSUMERS"],
deps = [ deps = [
"//pkg/kubectl:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/meta/testrestmapper:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta/testrestmapper:go_default_library",
@ -18,6 +18,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/runtime: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/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer: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/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
"//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library",

View File

@ -49,7 +49,6 @@ import (
"k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/openapi"
openapitesting "k8s.io/kubectl/pkg/util/openapi/testing" openapitesting "k8s.io/kubectl/pkg/util/openapi/testing"
"k8s.io/kubectl/pkg/validation" "k8s.io/kubectl/pkg/validation"
"k8s.io/kubernetes/pkg/kubectl"
) )
// InternalType is the schema for internal type // InternalType is the schema for internal type
@ -284,9 +283,9 @@ type TestFactory struct {
kubeConfigFlags *genericclioptions.TestConfigFlags kubeConfigFlags *genericclioptions.TestConfigFlags
Client kubectl.RESTClient Client RESTClient
ScaleGetter scaleclient.ScalesGetter ScaleGetter scaleclient.ScalesGetter
UnstructuredClient kubectl.RESTClient UnstructuredClient RESTClient
ClientConfigVal *restclient.Config ClientConfigVal *restclient.Config
FakeDynamicClient *fakedynamic.FakeDynamicClient FakeDynamicClient *fakedynamic.FakeDynamicClient

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package kubectl package testing
import ( import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"