diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD index 6363bcdbb2..56aa051a09 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD @@ -17,9 +17,9 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//pkg/client/typed/discovery:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go index a5780014f2..4cbd8ee8c8 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -19,10 +19,10 @@ package clientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" - _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) type Interface interface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD index abeea15fcd..625408d031 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD @@ -17,9 +17,9 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//pkg/client/typed/discovery:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go index 93c3c1e06c..94ef80b766 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go @@ -19,10 +19,10 @@ package internalclientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" - _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) type Interface interface { diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go index f4309498db..116043a98d 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -64,7 +64,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) { imports = append(imports, "github.com/golang/glog") imports = append(imports, "k8s.io/client-go/pkg/util/flowcontrol") // import solely to initialize client auth plugins. - imports = append(imports, "_ \"k8s.io/kubernetes/plugin/pkg/client/auth\"") + imports = append(imports, "_ \"k8s.io/client-go/plugin/pkg/client/auth\"") return } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD index 7e7e8369c8..92cabdbe8d 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD @@ -18,9 +18,9 @@ go_library( deps = [ "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", "//pkg/client/typed/discovery:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go index a5fffeda58..b7a8a86fc6 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go @@ -19,10 +19,10 @@ package test_internalclientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" internalversiontestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" - _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) type Interface interface { diff --git a/federation/client/clientset_generated/federation_clientset/BUILD b/federation/client/clientset_generated/federation_clientset/BUILD index 1b9427befd..8ad7222816 100644 --- a/federation/client/clientset_generated/federation_clientset/BUILD +++ b/federation/client/clientset_generated/federation_clientset/BUILD @@ -22,9 +22,9 @@ go_library( "//federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1:go_default_library", "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", "//pkg/client/typed/discovery:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/clientset.go b/federation/client/clientset_generated/federation_clientset/clientset.go index 8b39641654..7ce9fdd07a 100644 --- a/federation/client/clientset_generated/federation_clientset/clientset.go +++ b/federation/client/clientset_generated/federation_clientset/clientset.go @@ -19,13 +19,13 @@ package federation_clientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" v1batch "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1" v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" - _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) type Interface interface { diff --git a/federation/client/clientset_generated/federation_internalclientset/BUILD b/federation/client/clientset_generated/federation_internalclientset/BUILD index f5fdbb9f45..595c18f0dd 100644 --- a/federation/client/clientset_generated/federation_internalclientset/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/BUILD @@ -22,9 +22,9 @@ go_library( "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", "//pkg/client/typed/discovery:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/clientset.go b/federation/client/clientset_generated/federation_internalclientset/clientset.go index 384279514b..f296acff19 100644 --- a/federation/client/clientset_generated/federation_internalclientset/clientset.go +++ b/federation/client/clientset_generated/federation_internalclientset/clientset.go @@ -19,13 +19,13 @@ package federation_internalclientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" internalversionbatch "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion" internalversioncore "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" internalversionextensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" internalversionfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" - _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) type Interface interface { diff --git a/pkg/client/clientset_generated/clientset/BUILD b/pkg/client/clientset_generated/clientset/BUILD index 25f5456aeb..056623bbc3 100644 --- a/pkg/client/clientset_generated/clientset/BUILD +++ b/pkg/client/clientset_generated/clientset/BUILD @@ -42,9 +42,9 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library", "//pkg/client/typed/discovery:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/clientset.go b/pkg/client/clientset_generated/clientset/clientset.go index b3a6a4ba8d..b8e6da8e6f 100644 --- a/pkg/client/clientset_generated/clientset/clientset.go +++ b/pkg/client/clientset_generated/clientset/clientset.go @@ -19,6 +19,7 @@ package clientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" v1beta1apps "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" v1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" @@ -34,7 +35,6 @@ import ( v1beta1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" v1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" - _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) type Interface interface { diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/BUILD index 7538c0f08d..64eed9864b 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/BUILD @@ -21,12 +21,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/certificates/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/BUILD index c94d52cf2e..e24906db8f 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/BUILD @@ -20,13 +20,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/certificates/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/certificates/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/BUILD b/pkg/client/clientset_generated/internalclientset/BUILD index 0639817e75..8ef2ab7f78 100644 --- a/pkg/client/clientset_generated/internalclientset/BUILD +++ b/pkg/client/clientset_generated/internalclientset/BUILD @@ -41,9 +41,9 @@ go_library( "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", "//pkg/client/typed/discovery:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index ee063c5151..df073c9e18 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -19,6 +19,7 @@ package internalclientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" internalversionapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" internalversionauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" @@ -32,7 +33,6 @@ import ( internalversionrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" internalversionstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" - _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) type Interface interface { diff --git a/pkg/client/typed/discovery/BUILD b/pkg/client/typed/discovery/BUILD index 49e5a73962..d14274f184 100644 --- a/pkg/client/typed/discovery/BUILD +++ b/pkg/client/typed/discovery/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/version:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -32,6 +31,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/version", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/typed/discovery/helper.go b/pkg/client/typed/discovery/helper.go index 6e776ca3d2..1c511a6051 100644 --- a/pkg/client/typed/discovery/helper.go +++ b/pkg/client/typed/discovery/helper.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/version" // Import solely to initialize client auth plugins. - _ "k8s.io/kubernetes/plugin/pkg/client/auth" + _ "k8s.io/client-go/plugin/pkg/client/auth" ) // MatchesServerVersion queries the server to compares the build version diff --git a/pkg/client/unversioned/BUILD b/pkg/client/unversioned/BUILD index 6bf47063c0..07ca472a2f 100644 --- a/pkg/client/unversioned/BUILD +++ b/pkg/client/unversioned/BUILD @@ -24,12 +24,12 @@ go_library( "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//plugin/pkg/client/auth:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/unversioned/helper.go b/pkg/client/unversioned/helper.go index 6d2abc62ff..c8d09ef41e 100644 --- a/pkg/client/unversioned/helper.go +++ b/pkg/client/unversioned/helper.go @@ -20,7 +20,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" // Import solely to initialize client auth plugins. - _ "k8s.io/kubernetes/plugin/pkg/client/auth" + _ "k8s.io/client-go/plugin/pkg/client/auth" ) const ( diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 719d2c42aa..f1fd1c0480 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -87,7 +87,6 @@ go_library( "//pkg/kubelet/qos:go_default_library", "//pkg/util:go_default_library", "//pkg/util/intstr:go_default_library", - "//pkg/util/jsonpath:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/slice:go_default_library", "//pkg/util/uuid:go_default_library", @@ -111,6 +110,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/util/integer", + "//vendor:k8s.io/client-go/pkg/util/jsonpath", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/kubectl/custom_column_printer.go b/pkg/kubectl/custom_column_printer.go index 6cefff9fce..b8059c85d7 100644 --- a/pkg/kubectl/custom_column_printer.go +++ b/pkg/kubectl/custom_column_printer.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/util/jsonpath" + "k8s.io/client-go/pkg/util/jsonpath" ) const ( diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index b09dba3322..3971ff539f 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -38,6 +38,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/client-go/pkg/util/jsonpath" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/events" @@ -50,7 +51,6 @@ import ( "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/storage" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" - "k8s.io/kubernetes/pkg/util/jsonpath" "k8s.io/kubernetes/pkg/util/node" "github.com/ghodss/yaml" diff --git a/pkg/kubectl/sorting_printer.go b/pkg/kubectl/sorting_printer.go index 7c7d0295a6..c003d39970 100644 --- a/pkg/kubectl/sorting_printer.go +++ b/pkg/kubectl/sorting_printer.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/util/integer" + "k8s.io/client-go/pkg/util/jsonpath" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/jsonpath" ) // Sorting printer sorts list types before delegating to another printer. diff --git a/pkg/util/BUILD b/pkg/util/BUILD index 6f53ba0932..a5dcd03d3a 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -73,7 +73,6 @@ filegroup( "//pkg/util/io:all-srcs", "//pkg/util/iptables:all-srcs", "//pkg/util/json:all-srcs", - "//pkg/util/jsonpath:all-srcs", "//pkg/util/keymutex:all-srcs", "//pkg/util/labels:all-srcs", "//pkg/util/limitwriter:all-srcs", diff --git a/pkg/util/jsonpath/BUILD b/pkg/util/jsonpath/BUILD deleted file mode 100644 index b54bfbd047..0000000000 --- a/pkg/util/jsonpath/BUILD +++ /dev/null @@ -1,44 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "jsonpath.go", - "node.go", - "parser.go", - ], - tags = ["automanaged"], - deps = ["//third_party/forked/golang/template:go_default_library"], -) - -go_test( - name = "go_default_test", - srcs = [ - "jsonpath_test.go", - "parser_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/plugin/BUILD b/plugin/BUILD index fabfccfae1..9225d06f72 100644 --- a/plugin/BUILD +++ b/plugin/BUILD @@ -34,7 +34,6 @@ filegroup( "//plugin/pkg/admission/serviceaccount:all-srcs", "//plugin/pkg/admission/storageclass/default:all-srcs", "//plugin/pkg/auth:all-srcs", - "//plugin/pkg/client/auth:all-srcs", "//plugin/pkg/scheduler:all-srcs", ], tags = ["automanaged"], diff --git a/vendor/BUILD b/vendor/BUILD index 8938efee3d..8b409b4016 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -12817,10 +12817,10 @@ go_test( library = ":k8s.io/client-go/plugin/pkg/client/auth/oidc", tags = ["automanaged"], deps = [ + "//plugin/pkg/auth/authenticator/token/oidc/testing:go_default_library", "//vendor:github.com/coreos/go-oidc/jose", "//vendor:github.com/coreos/go-oidc/key", "//vendor:github.com/coreos/go-oidc/oauth2", - "//vendor:k8s.io/client-go/plugin/pkg/auth/authenticator/token/oidc/testing", ], ) @@ -13646,3 +13646,13 @@ go_test( library = ":k8s.io/client-go/pkg/util/testing", tags = ["automanaged"], ) + +go_test( + name = "k8s.io/client-go/pkg/util/jsonpath_test", + srcs = [ + "k8s.io/client-go/pkg/util/jsonpath/jsonpath_test.go", + "k8s.io/client-go/pkg/util/jsonpath/parser_test.go", + ], + library = ":k8s.io/client-go/pkg/util/jsonpath", + tags = ["automanaged"], +)