From 85e83512b083c351d673aa0fddae33c897adc50e Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 13:32:40 -0700 Subject: [PATCH] Updated BUILD dependency to use staging --- build/root/BUILD.root | 6 ------ pkg/kubectl/describe/versioned/BUILD | 2 +- pkg/kubectl/describe/versioned/describe.go | 2 +- pkg/kubectl/util/BUILD | 1 - vendor/modules.txt | 1 + 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build/root/BUILD.root b/build/root/BUILD.root index 4ab7f316be6..41b76e68ba5 100644 --- a/build/root/BUILD.root +++ b/build/root/BUILD.root @@ -89,12 +89,6 @@ filegroup( "//cmd:all-srcs", "//docs:all-srcs", "//hack:all-srcs", - "//kubernetes/cluster:all-srcs", - "//kubernetes/docs:all-srcs", - "//kubernetes/hack:all-srcs", - "//kubernetes/test/e2e/testing-manifests:all-srcs", - "//kubernetes/test/images:all-srcs", - "//kubernetes/test/kubemark:all-srcs", "//pkg:all-srcs", "//plugin:all-srcs", "//staging:all-srcs", diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD index 5498c96edec..06d190db3fb 100644 --- a/pkg/kubectl/describe/versioned/BUILD +++ b/pkg/kubectl/describe/versioned/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/describe:go_default_library", "//pkg/kubectl/scheme:go_default_library", - "//pkg/kubectl/util/certificate:go_default_library", "//pkg/kubectl/util/fieldpath:go_default_library", "//pkg/kubectl/util/slice:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", @@ -42,6 +41,7 @@ go_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/tools/reference:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/certificate:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/event:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/qos:go_default_library", diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index da9f59aaab8..b86a7296ca3 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -65,6 +65,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/reference" "k8s.io/klog" + "k8s.io/kubectl/pkg/util/certificate" deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubectl/pkg/util/event" "k8s.io/kubectl/pkg/util/qos" @@ -73,7 +74,6 @@ import ( storageutil "k8s.io/kubectl/pkg/util/storage" "k8s.io/kubernetes/pkg/kubectl/describe" "k8s.io/kubernetes/pkg/kubectl/scheme" - "k8s.io/kubernetes/pkg/kubectl/util/certificate" "k8s.io/kubernetes/pkg/kubectl/util/fieldpath" "k8s.io/kubernetes/pkg/kubectl/util/slice" ) diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index e6bd221c9e4..71177611279 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -66,7 +66,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/util/certificate:all-srcs", "//pkg/kubectl/util/fieldpath:all-srcs", "//pkg/kubectl/util/i18n:all-srcs", "//pkg/kubectl/util/logs:all-srcs", diff --git a/vendor/modules.txt b/vendor/modules.txt index 417f6297ce0..c23e85b4925 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1636,6 +1636,7 @@ k8s.io/kube-proxy/config/v1alpha1 # k8s.io/kube-scheduler v0.0.0 => ./staging/src/k8s.io/kube-scheduler k8s.io/kube-scheduler/config/v1alpha1 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl +k8s.io/kubectl/pkg/util/certificate k8s.io/kubectl/pkg/util/deployment k8s.io/kubectl/pkg/util/event k8s.io/kubectl/pkg/util/hash