diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD index 56aa051a099..414ccc150c8 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD @@ -18,9 +18,9 @@ go_library( "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//pkg/client/typed/discovery: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", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) 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 4cbd8ee8c84..9a357a393b4 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -18,9 +18,9 @@ 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" + "k8s.io/client-go/util/flowcontrol" v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD index 625408d0312..c823fa448ff 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD @@ -18,9 +18,9 @@ go_library( "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//pkg/client/typed/discovery: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", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) 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 94ef80b7669..0d86bb3f60a 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go @@ -18,9 +18,9 @@ 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" + "k8s.io/client-go/util/flowcontrol" internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" ) diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index 94ffd25ca14..1fd44893f44 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -98,9 +98,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/server/healthz", - "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/clientcmd", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index ebbfc58afc2..6f3b11b899e 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -36,9 +36,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/server/healthz" - certutil "k8s.io/client-go/pkg/util/cert" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/cmd/kubeadm/app/cmd/BUILD b/cmd/kubeadm/app/cmd/BUILD index 9d6208bb447..981b09b3d5a 100644 --- a/cmd/kubeadm/app/cmd/BUILD +++ b/cmd/kubeadm/app/cmd/BUILD @@ -47,7 +47,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index 987c2b3cfe3..268483dd603 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/runtime" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation" diff --git a/cmd/kubeadm/app/master/BUILD b/cmd/kubeadm/app/master/BUILD index cc705009ebe..b3b57075ac3 100644 --- a/cmd/kubeadm/app/master/BUILD +++ b/cmd/kubeadm/app/master/BUILD @@ -38,9 +38,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/cmd/kubeadm/app/master/discovery.go b/cmd/kubeadm/app/master/discovery.go index 58ee74d746f..cc4d2b44341 100644 --- a/cmd/kubeadm/app/master/discovery.go +++ b/cmd/kubeadm/app/master/discovery.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" diff --git a/cmd/kubeadm/app/node/BUILD b/cmd/kubeadm/app/node/BUILD index 2b10f0065a3..9db972cf18b 100644 --- a/cmd/kubeadm/app/node/BUILD +++ b/cmd/kubeadm/app/node/BUILD @@ -28,9 +28,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/cmd/kubeadm/app/node/csr.go b/cmd/kubeadm/app/node/csr.go index 65e0f72ab38..8771c31e8d9 100644 --- a/cmd/kubeadm/app/node/csr.go +++ b/cmd/kubeadm/app/node/csr.go @@ -21,9 +21,9 @@ import ( "os" "k8s.io/apimachinery/pkg/types" - certutil "k8s.io/client-go/pkg/util/cert" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/kubelet/util/csr" ) diff --git a/cmd/kubeadm/app/phases/certs/BUILD b/cmd/kubeadm/app/phases/certs/BUILD index bbab6f74943..2e0644385e3 100644 --- a/cmd/kubeadm/app/phases/certs/BUILD +++ b/cmd/kubeadm/app/phases/certs/BUILD @@ -15,7 +15,7 @@ go_test( tags = ["automanaged"], deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) @@ -32,7 +32,7 @@ go_library( "//cmd/kubeadm/app/phases/certs/pkiutil:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/cmd/kubeadm/app/phases/certs/certs.go b/cmd/kubeadm/app/phases/certs/certs.go index 2cff7b49fda..4db869d15a4 100644 --- a/cmd/kubeadm/app/phases/certs/certs.go +++ b/cmd/kubeadm/app/phases/certs/certs.go @@ -24,7 +24,7 @@ import ( "os" setutil "k8s.io/apimachinery/pkg/util/sets" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs/pkiutil" diff --git a/cmd/kubeadm/app/phases/certs/certs_test.go b/cmd/kubeadm/app/phases/certs/certs_test.go index 14ffee522cf..8b1eb7a4d62 100644 --- a/cmd/kubeadm/app/phases/certs/certs_test.go +++ b/cmd/kubeadm/app/phases/certs/certs_test.go @@ -23,7 +23,7 @@ import ( "os" "testing" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) diff --git a/cmd/kubeadm/app/phases/certs/pkiutil/BUILD b/cmd/kubeadm/app/phases/certs/pkiutil/BUILD index d340676ff82..623f4a7a4d0 100644 --- a/cmd/kubeadm/app/phases/certs/pkiutil/BUILD +++ b/cmd/kubeadm/app/phases/certs/pkiutil/BUILD @@ -13,14 +13,14 @@ go_test( srcs = ["pki_helpers_test.go"], library = ":go_default_library", tags = ["automanaged"], - deps = ["//vendor:k8s.io/client-go/pkg/util/cert"], + deps = ["//vendor:k8s.io/client-go/util/cert"], ) go_library( name = "go_default_library", srcs = ["pki_helpers.go"], tags = ["automanaged"], - deps = ["//vendor:k8s.io/client-go/pkg/util/cert"], + deps = ["//vendor:k8s.io/client-go/util/cert"], ) filegroup( diff --git a/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers.go b/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers.go index 483db37472a..5a95160db80 100644 --- a/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers.go +++ b/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers.go @@ -25,7 +25,7 @@ import ( "path" "time" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" ) // TODO: It should be able to generate different types of private keys, at least: RSA and ECDSA (and in the future maybe Ed25519 as well) diff --git a/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers_test.go b/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers_test.go index 8e827b846a3..c73624b181c 100644 --- a/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers_test.go +++ b/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" ) func TestNewCertificateAuthority(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/kubeconfig/BUILD b/cmd/kubeadm/app/phases/kubeconfig/BUILD index 1fd03a9d656..ae0c3fdc56b 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/BUILD +++ b/cmd/kubeadm/app/phases/kubeconfig/BUILD @@ -26,9 +26,9 @@ go_library( deps = [ "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/phases/certs/pkiutil:go_default_library", - "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go index 044021f238b..0a9b1279b88 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go +++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go @@ -25,9 +25,9 @@ import ( "os" "path/filepath" - certutil "k8s.io/client-go/pkg/util/cert" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + certutil "k8s.io/client-go/util/cert" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs/pkiutil" ) diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index 3f75e1776f9..4fec04b3086 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -114,11 +114,11 @@ go_library( "//vendor:k8s.io/client-go/kubernetes", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", - "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/auth", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/cmd/kubelet/app/bootstrap.go b/cmd/kubelet/app/bootstrap.go index 96262065215..cdc7ff215e8 100644 --- a/cmd/kubelet/app/bootstrap.go +++ b/cmd/kubelet/app/bootstrap.go @@ -26,10 +26,10 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/types" - certutil "k8s.io/client-go/pkg/util/cert" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + certutil "k8s.io/client-go/util/cert" certificates "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" "k8s.io/kubernetes/pkg/kubelet/util/csr" ) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 779eb6e28ae..552e90ab0a1 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -44,12 +44,12 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/cert" - certutil "k8s.io/client-go/pkg/util/cert" restclient "k8s.io/client-go/rest" clientauth "k8s.io/client-go/tools/auth" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/client-go/util/cert" + certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" 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 116043a98d6..e82ac985d8a 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -62,7 +62,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") + imports = append(imports, "k8s.io/client-go/util/flowcontrol") // import solely to initialize client auth plugins. 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 92cabdbe8d9..2c5b27e5737 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 @@ -19,9 +19,9 @@ go_library( "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", "//pkg/client/typed/discovery: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", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -31,8 +31,8 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) 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 b7a8a86fc66..3b48200a49f 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 @@ -18,9 +18,9 @@ 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" + "k8s.io/client-go/util/flowcontrol" 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" ) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go index 3a68be4a509..39cc4d9bcb1 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go @@ -19,8 +19,8 @@ package test_internalclientset import ( "testing" - "k8s.io/client-go/pkg/util/flowcontrol" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/flowcontrol" ) func ClientSetRateLimiterTest(t *testing.T) { diff --git a/federation/client/clientset_generated/federation_clientset/BUILD b/federation/client/clientset_generated/federation_clientset/BUILD index c90644842c5..784c78a24b1 100644 --- a/federation/client/clientset_generated/federation_clientset/BUILD +++ b/federation/client/clientset_generated/federation_clientset/BUILD @@ -24,9 +24,9 @@ go_library( "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", "//pkg/client/typed/discovery: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", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/clientset.go b/federation/client/clientset_generated/federation_clientset/clientset.go index c2c2ff5dae3..c1f7d75667a 100644 --- a/federation/client/clientset_generated/federation_clientset/clientset.go +++ b/federation/client/clientset_generated/federation_clientset/clientset.go @@ -18,9 +18,9 @@ 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" + "k8s.io/client-go/util/flowcontrol" v1autoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1" 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" diff --git a/federation/client/clientset_generated/federation_internalclientset/BUILD b/federation/client/clientset_generated/federation_internalclientset/BUILD index ec03da6e7ab..7b9f997f9c1 100644 --- a/federation/client/clientset_generated/federation_internalclientset/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/BUILD @@ -24,9 +24,9 @@ go_library( "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", "//pkg/client/typed/discovery: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", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/clientset.go b/federation/client/clientset_generated/federation_internalclientset/clientset.go index 8e9e36d413d..fad1601c27d 100644 --- a/federation/client/clientset_generated/federation_internalclientset/clientset.go +++ b/federation/client/clientset_generated/federation_internalclientset/clientset.go @@ -18,9 +18,9 @@ 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" + "k8s.io/client-go/util/flowcontrol" internalversionautoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion" 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" diff --git a/federation/pkg/federation-controller/configmap/BUILD b/federation/pkg/federation-controller/configmap/BUILD index 8251338cb4d..3266cfcabb6 100644 --- a/federation/pkg/federation-controller/configmap/BUILD +++ b/federation/pkg/federation-controller/configmap/BUILD @@ -28,7 +28,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/pkg/federation-controller/configmap/configmap_controller.go b/federation/pkg/federation-controller/configmap/configmap_controller.go index acf7139ed36..49d9cd2c00d 100644 --- a/federation/pkg/federation-controller/configmap/configmap_controller.go +++ b/federation/pkg/federation-controller/configmap/configmap_controller.go @@ -23,7 +23,7 @@ import ( pkgruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" diff --git a/federation/pkg/federation-controller/daemonset/BUILD b/federation/pkg/federation-controller/daemonset/BUILD index d057a657f8c..cc903d20bef 100644 --- a/federation/pkg/federation-controller/daemonset/BUILD +++ b/federation/pkg/federation-controller/daemonset/BUILD @@ -31,7 +31,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/pkg/federation-controller/daemonset/daemonset_controller.go b/federation/pkg/federation-controller/daemonset/daemonset_controller.go index 9a815c0d307..4b7f273e00b 100644 --- a/federation/pkg/federation-controller/daemonset/daemonset_controller.go +++ b/federation/pkg/federation-controller/daemonset/daemonset_controller.go @@ -26,7 +26,7 @@ import ( pkgruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" diff --git a/federation/pkg/federation-controller/deployment/BUILD b/federation/pkg/federation-controller/deployment/BUILD index e0da49a68c2..89b59d93fc0 100644 --- a/federation/pkg/federation-controller/deployment/BUILD +++ b/federation/pkg/federation-controller/deployment/BUILD @@ -35,7 +35,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/pkg/federation-controller/deployment/deploymentcontroller.go b/federation/pkg/federation-controller/deployment/deploymentcontroller.go index 415ac7fa192..215c3ff82df 100644 --- a/federation/pkg/federation-controller/deployment/deploymentcontroller.go +++ b/federation/pkg/federation-controller/deployment/deploymentcontroller.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" fed "k8s.io/kubernetes/federation/apis/federation" fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" diff --git a/federation/pkg/federation-controller/ingress/BUILD b/federation/pkg/federation-controller/ingress/BUILD index 5ecde2a4b40..62077c9d1b8 100644 --- a/federation/pkg/federation-controller/ingress/BUILD +++ b/federation/pkg/federation-controller/ingress/BUILD @@ -32,7 +32,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/pkg/federation-controller/ingress/ingress_controller.go b/federation/pkg/federation-controller/ingress/ingress_controller.go index 3bffd07098b..0b59cb536ab 100644 --- a/federation/pkg/federation-controller/ingress/ingress_controller.go +++ b/federation/pkg/federation-controller/ingress/ingress_controller.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" diff --git a/federation/pkg/federation-controller/namespace/BUILD b/federation/pkg/federation-controller/namespace/BUILD index 94aeb77d63a..b75e6bce73b 100644 --- a/federation/pkg/federation-controller/namespace/BUILD +++ b/federation/pkg/federation-controller/namespace/BUILD @@ -29,7 +29,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/pkg/federation-controller/namespace/namespace_controller.go b/federation/pkg/federation-controller/namespace/namespace_controller.go index ef15f153500..c690494fca2 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" diff --git a/federation/pkg/federation-controller/replicaset/BUILD b/federation/pkg/federation-controller/replicaset/BUILD index ad6d1658514..0ffa93b69a4 100644 --- a/federation/pkg/federation-controller/replicaset/BUILD +++ b/federation/pkg/federation-controller/replicaset/BUILD @@ -36,7 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go index 5cf62cf62de..b940ccffb80 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" fed "k8s.io/kubernetes/federation/apis/federation" fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" diff --git a/federation/pkg/federation-controller/secret/BUILD b/federation/pkg/federation-controller/secret/BUILD index 89b84628ca9..ff2eeab236d 100644 --- a/federation/pkg/federation-controller/secret/BUILD +++ b/federation/pkg/federation-controller/secret/BUILD @@ -30,7 +30,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/pkg/federation-controller/secret/secret_controller.go b/federation/pkg/federation-controller/secret/secret_controller.go index 83852bbc94c..55b9389906a 100644 --- a/federation/pkg/federation-controller/secret/secret_controller.go +++ b/federation/pkg/federation-controller/secret/secret_controller.go @@ -25,7 +25,7 @@ import ( pkgruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" diff --git a/federation/pkg/federation-controller/util/BUILD b/federation/pkg/federation-controller/util/BUILD index ee4c9376264..e47b57b50ae 100644 --- a/federation/pkg/federation-controller/util/BUILD +++ b/federation/pkg/federation-controller/util/BUILD @@ -39,10 +39,10 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/federation/pkg/federation-controller/util/backoff.go b/federation/pkg/federation-controller/util/backoff.go index 29084fd9316..b5b01213a04 100644 --- a/federation/pkg/federation-controller/util/backoff.go +++ b/federation/pkg/federation-controller/util/backoff.go @@ -19,7 +19,7 @@ package util import ( "time" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" ) func StartBackoffGC(backoff *flowcontrol.Backoff, stopCh <-chan struct{}) { diff --git a/federation/pkg/kubefed/init/BUILD b/federation/pkg/kubefed/init/BUILD index 34616819a1e..d036f43190c 100644 --- a/federation/pkg/kubefed/init/BUILD +++ b/federation/pkg/kubefed/init/BUILD @@ -26,10 +26,10 @@ go_library( "//vendor:github.com/spf13/cobra", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/cert", - "//vendor:k8s.io/client-go/pkg/util/cert/triple", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", + "//vendor:k8s.io/client-go/util/cert", + "//vendor:k8s.io/client-go/util/cert/triple", ], ) diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go index 609b709f459..b0704c5b224 100644 --- a/federation/pkg/kubefed/init/init.go +++ b/federation/pkg/kubefed/init/init.go @@ -38,10 +38,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - certutil "k8s.io/client-go/pkg/util/cert" - triple "k8s.io/client-go/pkg/util/cert/triple" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + certutil "k8s.io/client-go/util/cert" + triple "k8s.io/client-go/util/cert/triple" kubeadmkubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig" "k8s.io/kubernetes/federation/pkg/kubefed/util" "k8s.io/kubernetes/pkg/api" diff --git a/hack/.linted_packages b/hack/.linted_packages index fe1adccf2fc..14b4dd8529b 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -298,6 +298,8 @@ staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp staging/src/k8s.io/client-go/rest/watch staging/src/k8s.io/client-go/tools/auth staging/src/k8s.io/client-go/tools/metrics +staging/src/k8s.io/client-go/util/cert +staging/src/k8s.io/client-go/util/homedir test/e2e/perftype test/e2e_node/runner/local test/images/clusterapi-tester diff --git a/pkg/client/cache/BUILD b/pkg/client/cache/BUILD index d2038aa37e3..68c1c52ddab 100644 --- a/pkg/client/cache/BUILD +++ b/pkg/client/cache/BUILD @@ -44,8 +44,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -75,7 +75,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -106,7 +106,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/client/cache/expiration_cache.go b/pkg/client/cache/expiration_cache.go index 10d68c533af..befac1c758d 100644 --- a/pkg/client/cache/expiration_cache.go +++ b/pkg/client/cache/expiration_cache.go @@ -21,7 +21,7 @@ import ( "time" "github.com/golang/glog" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) // ExpirationCache implements the store interface diff --git a/pkg/client/cache/expiration_cache_fakes.go b/pkg/client/cache/expiration_cache_fakes.go index e4d4063c44b..ab2f57687ef 100644 --- a/pkg/client/cache/expiration_cache_fakes.go +++ b/pkg/client/cache/expiration_cache_fakes.go @@ -18,7 +18,7 @@ package cache import ( "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) type fakeThreadSafeMap struct { diff --git a/pkg/client/cache/expiration_cache_test.go b/pkg/client/cache/expiration_cache_test.go index 0938e9fc128..17139d5940c 100644 --- a/pkg/client/cache/expiration_cache_test.go +++ b/pkg/client/cache/expiration_cache_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func TestTTLExpirationBasic(t *testing.T) { diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index b607f965677..6e74fbafcdd 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/client/clientset_generated/clientset/BUILD b/pkg/client/clientset_generated/clientset/BUILD index 056623bbc3c..c1ee76cf52c 100644 --- a/pkg/client/clientset_generated/clientset/BUILD +++ b/pkg/client/clientset_generated/clientset/BUILD @@ -43,9 +43,9 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library", "//pkg/client/typed/discovery: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", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/client/clientset_generated/clientset/clientset.go b/pkg/client/clientset_generated/clientset/clientset.go index b8e6da8e6fc..da82a16507b 100644 --- a/pkg/client/clientset_generated/clientset/clientset.go +++ b/pkg/client/clientset_generated/clientset/clientset.go @@ -18,9 +18,9 @@ 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" + "k8s.io/client-go/util/flowcontrol" v1beta1apps "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" v1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" diff --git a/pkg/client/clientset_generated/internalclientset/BUILD b/pkg/client/clientset_generated/internalclientset/BUILD index 8ef2ab7f783..d45072e5519 100644 --- a/pkg/client/clientset_generated/internalclientset/BUILD +++ b/pkg/client/clientset_generated/internalclientset/BUILD @@ -42,9 +42,9 @@ go_library( "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", "//pkg/client/typed/discovery: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", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index df073c9e18c..fea7aed702a 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -18,9 +18,9 @@ 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" + "k8s.io/client-go/util/flowcontrol" internalversionapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" internalversionauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" internalversionauthorization "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" diff --git a/pkg/client/record/BUILD b/pkg/client/record/BUILD index 4ee4681241b..0eeae3ea647 100644 --- a/pkg/client/record/BUILD +++ b/pkg/client/record/BUILD @@ -28,8 +28,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -49,8 +49,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/client/record/event.go b/pkg/client/record/event.go index cddcbe87ef3..d3ece3f377b 100644 --- a/pkg/client/record/event.go +++ b/pkg/client/record/event.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/clock" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/v1" "net/http" diff --git a/pkg/client/record/event_test.go b/pkg/client/record/event_test.go index 1322ee9b4b6..256b6b4e68b 100644 --- a/pkg/client/record/event_test.go +++ b/pkg/client/record/event_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sruntime "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/pkg/util/clock" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/clock" _ "k8s.io/kubernetes/pkg/api/install" // To register api.Pod used in tests below "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/strategicpatch" diff --git a/pkg/client/record/events_cache.go b/pkg/client/record/events_cache.go index ab7df3fef60..b180fcdb2ae 100644 --- a/pkg/client/record/events_cache.go +++ b/pkg/client/record/events_cache.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/strategicpatch" ) diff --git a/pkg/client/record/events_cache_test.go b/pkg/client/record/events_cache_test.go index bf0e4e0be8a..0ccc18745a0 100644 --- a/pkg/client/record/events_cache_test.go +++ b/pkg/client/record/events_cache_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/diff" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/pkg/client/restclient/fake/BUILD b/pkg/client/restclient/fake/BUILD index 3893ccc093c..6964e8b7971 100644 --- a/pkg/client/restclient/fake/BUILD +++ b/pkg/client/restclient/fake/BUILD @@ -17,8 +17,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/client/restclient/fake/fake.go b/pkg/client/restclient/fake/fake.go index 835829583b1..adc1721276d 100644 --- a/pkg/client/restclient/fake/fake.go +++ b/pkg/client/restclient/fake/fake.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/flowcontrol" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" ) diff --git a/pkg/client/typed/dynamic/BUILD b/pkg/client/typed/dynamic/BUILD index d233726edb7..962b6e7126d 100644 --- a/pkg/client/typed/dynamic/BUILD +++ b/pkg/client/typed/dynamic/BUILD @@ -28,8 +28,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/client/typed/dynamic/client.go b/pkg/client/typed/dynamic/client.go index 39851a974f4..cbafb64cbbe 100644 --- a/pkg/client/typed/dynamic/client.go +++ b/pkg/client/typed/dynamic/client.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/pkg/client/unversioned/testclient/simple/BUILD b/pkg/client/unversioned/testclient/simple/BUILD index 525e69cf69d..8a24295dc63 100644 --- a/pkg/client/unversioned/testclient/simple/BUILD +++ b/pkg/client/unversioned/testclient/simple/BUILD @@ -19,8 +19,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/client/unversioned/testclient/simple/simple_testclient.go b/pkg/client/unversioned/testclient/simple/simple_testclient.go index d94d1d40e58..a9f948dd920 100644 --- a/pkg/client/unversioned/testclient/simple/simple_testclient.go +++ b/pkg/client/unversioned/testclient/simple/simple_testclient.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/pkg/cloudprovider/providers/gce/BUILD b/pkg/cloudprovider/providers/gce/BUILD index 5d0b35183ad..bd5785d09eb 100644 --- a/pkg/cloudprovider/providers/gce/BUILD +++ b/pkg/cloudprovider/providers/gce/BUILD @@ -36,7 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 9b3424f8490..b165dc5fca3 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -35,7 +35,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" apiservice "k8s.io/kubernetes/pkg/api/v1/service" "k8s.io/kubernetes/pkg/cloudprovider" diff --git a/pkg/cloudprovider/providers/gce/token_source.go b/pkg/cloudprovider/providers/gce/token_source.go index 3caf0546531..2f4bb09119a 100644 --- a/pkg/cloudprovider/providers/gce/token_source.go +++ b/pkg/cloudprovider/providers/gce/token_source.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "github.com/prometheus/client_golang/prometheus" "golang.org/x/oauth2" diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index 01645f2053b..e4a86ea25eb 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -42,9 +42,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/authentication/serviceaccount", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/integer", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/integer", ], ) @@ -65,9 +65,9 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/controller/certificates/BUILD b/pkg/controller/certificates/BUILD index 64197ce2845..4dbf87c43c9 100644 --- a/pkg/controller/certificates/BUILD +++ b/pkg/controller/certificates/BUILD @@ -69,6 +69,6 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/apis/certificates/v1beta1:go_default_library", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/pkg/controller/certificates/cfssl_signer_test.go b/pkg/controller/certificates/cfssl_signer_test.go index 4951e45f053..81d95b9edaf 100644 --- a/pkg/controller/certificates/cfssl_signer_test.go +++ b/pkg/controller/certificates/cfssl_signer_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "k8s.io/client-go/pkg/util/cert" + "k8s.io/client-go/util/cert" capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" ) diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 9d484b4e25a..ca4aaac645a 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" - "k8s.io/client-go/pkg/util/integer" + "k8s.io/client-go/util/clock" + "k8s.io/client-go/util/integer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index 1e3fd92fb4b..60dcaa3563c 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -30,9 +30,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/clock" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 61ef0d3872f..d0c36f4e631 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -42,7 +42,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/integer", + "//vendor:k8s.io/client-go/util/integer", ], ) diff --git a/pkg/controller/deployment/rolling.go b/pkg/controller/deployment/rolling.go index 2cacc6be7df..c783cb048b9 100644 --- a/pkg/controller/deployment/rolling.go +++ b/pkg/controller/deployment/rolling.go @@ -21,7 +21,7 @@ import ( "sort" "github.com/golang/glog" - "k8s.io/client-go/pkg/util/integer" + "k8s.io/client-go/util/integer" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" diff --git a/pkg/controller/deployment/util/BUILD b/pkg/controller/deployment/util/BUILD index 3eeae233966..a0e8a2d7b39 100644 --- a/pkg/controller/deployment/util/BUILD +++ b/pkg/controller/deployment/util/BUILD @@ -38,7 +38,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/integer", + "//vendor:k8s.io/client-go/util/integer", ], ) diff --git a/pkg/controller/deployment/util/deployment_util.go b/pkg/controller/deployment/util/deployment_util.go index 4bc24b65785..1cd1c53cfba 100644 --- a/pkg/controller/deployment/util/deployment_util.go +++ b/pkg/controller/deployment/util/deployment_util.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/integer" + "k8s.io/client-go/util/integer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/controller/endpoint/BUILD b/pkg/controller/endpoint/BUILD index bbe3f65a62f..5b72229d2d9 100644 --- a/pkg/controller/endpoint/BUILD +++ b/pkg/controller/endpoint/BUILD @@ -54,8 +54,8 @@ go_test( "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 6f0d1d85e59..103ed319b84 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/controller/garbagecollector/BUILD b/pkg/controller/garbagecollector/BUILD index c1a4fd7a741..39df35871a5 100644 --- a/pkg/controller/garbagecollector/BUILD +++ b/pkg/controller/garbagecollector/BUILD @@ -39,7 +39,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -62,8 +62,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/json", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 3ed8be4e05b..17ad2be2cc8 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/pkg/controller/garbagecollector/garbagecollector_test.go b/pkg/controller/garbagecollector/garbagecollector_test.go index a355bce24db..0f2f762c643 100644 --- a/pkg/controller/garbagecollector/garbagecollector_test.go +++ b/pkg/controller/garbagecollector/garbagecollector_test.go @@ -33,8 +33,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/pkg/controller/garbagecollector/metrics.go b/pkg/controller/garbagecollector/metrics.go index 6b502a93023..dd6f03b0e71 100644 --- a/pkg/controller/garbagecollector/metrics.go +++ b/pkg/controller/garbagecollector/metrics.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/controller/node/BUILD b/pkg/controller/node/BUILD index 401aa8ebef9..185ed22cc71 100644 --- a/pkg/controller/node/BUILD +++ b/pkg/controller/node/BUILD @@ -46,7 +46,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -81,7 +81,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 3992558e6b9..f62773d1e8b 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/controller/node/rate_limited_queue.go b/pkg/controller/node/rate_limited_queue.go index 560898df8f8..05a1273f3d7 100644 --- a/pkg/controller/node/rate_limited_queue.go +++ b/pkg/controller/node/rate_limited_queue.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "github.com/golang/glog" ) diff --git a/pkg/controller/node/rate_limited_queue_test.go b/pkg/controller/node/rate_limited_queue_test.go index 7de22c1b994..21b79293fa0 100644 --- a/pkg/controller/node/rate_limited_queue_test.go +++ b/pkg/controller/node/rate_limited_queue_test.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" ) func CheckQueueEq(lhs []string, rhs TimedQueue) bool { diff --git a/pkg/controller/node/testutil/BUILD b/pkg/controller/node/testutil/BUILD index 5ec7c425611..d0c6c71215f 100644 --- a/pkg/controller/node/testutil/BUILD +++ b/pkg/controller/node/testutil/BUILD @@ -24,7 +24,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/controller/node/testutil/test_utils.go b/pkg/controller/node/testutil/test_utils.go index d90d0a46785..bd174c2f1b3 100644 --- a/pkg/controller/node/testutil/test_utils.go +++ b/pkg/controller/node/testutil/test_utils.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index 724adb668d3..7db9f066954 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -65,8 +65,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index ad8a4463db4..c1616b8c4c8 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -33,8 +33,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index 8d38d242b7b..32f6923265c 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -61,8 +61,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index 7bf20a74673..b626b83d466 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/controller/statefulset/BUILD b/pkg/controller/statefulset/BUILD index 427e2697436..616dae912a1 100644 --- a/pkg/controller/statefulset/BUILD +++ b/pkg/controller/statefulset/BUILD @@ -74,8 +74,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/controller/statefulset/statefulpod_test.go b/pkg/controller/statefulset/statefulpod_test.go index 36cfbdf8b59..093e99b9dfa 100644 --- a/pkg/controller/statefulset/statefulpod_test.go +++ b/pkg/controller/statefulset/statefulpod_test.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/genericapiserver/authenticator/BUILD b/pkg/genericapiserver/authenticator/BUILD index d95d65683c7..606bd1da8ab 100644 --- a/pkg/genericapiserver/authenticator/BUILD +++ b/pkg/genericapiserver/authenticator/BUILD @@ -28,7 +28,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authentication/token/tokenfile", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/pkg/genericapiserver/authenticator/delegating.go b/pkg/genericapiserver/authenticator/delegating.go index 23c55089259..275c91a0014 100644 --- a/pkg/genericapiserver/authenticator/delegating.go +++ b/pkg/genericapiserver/authenticator/delegating.go @@ -33,7 +33,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" - "k8s.io/client-go/pkg/util/cert" + "k8s.io/client-go/util/cert" webhooktoken "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook" ) diff --git a/pkg/genericapiserver/server/BUILD b/pkg/genericapiserver/server/BUILD index dc71c98435c..cfaea1f542e 100644 --- a/pkg/genericapiserver/server/BUILD +++ b/pkg/genericapiserver/server/BUILD @@ -45,7 +45,7 @@ go_test( "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) @@ -105,8 +105,8 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authorization/union", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/server/healthz", - "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/pkg/genericapiserver/server/config.go b/pkg/genericapiserver/server/config.go index 51d64b52cf8..64692e83b20 100644 --- a/pkg/genericapiserver/server/config.go +++ b/pkg/genericapiserver/server/config.go @@ -49,8 +49,8 @@ import ( authorizerunion "k8s.io/apiserver/pkg/authorization/union" apirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/server/healthz" - certutil "k8s.io/client-go/pkg/util/cert" restclient "k8s.io/client-go/rest" + certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/pkg/api" genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator" genericauthorizer "k8s.io/kubernetes/pkg/genericapiserver/authorizer" diff --git a/pkg/genericapiserver/server/options/BUILD b/pkg/genericapiserver/server/options/BUILD index 158ceb2ef1f..9b19fac46db 100644 --- a/pkg/genericapiserver/server/options/BUILD +++ b/pkg/genericapiserver/server/options/BUILD @@ -32,9 +32,9 @@ go_library( "//vendor:k8s.io/apiserver/pkg/admission", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", - "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/clientcmd", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/pkg/genericapiserver/server/options/serving.go b/pkg/genericapiserver/server/options/serving.go index 2d8bc40b78d..0e13d17b690 100644 --- a/pkg/genericapiserver/server/options/serving.go +++ b/pkg/genericapiserver/server/options/serving.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" utilnet "k8s.io/apimachinery/pkg/util/net" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/pkg/util/config" ) diff --git a/pkg/genericapiserver/server/serve_test.go b/pkg/genericapiserver/server/serve_test.go index 9079dbf4233..d7499e9b1ea 100644 --- a/pkg/genericapiserver/server/serve_test.go +++ b/pkg/genericapiserver/server/serve_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" - utilcert "k8s.io/client-go/pkg/util/cert" + utilcert "k8s.io/client-go/util/cert" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/genericapiserver/server/options" "k8s.io/kubernetes/pkg/util/config" diff --git a/pkg/kubeapiserver/authenticator/BUILD b/pkg/kubeapiserver/authenticator/BUILD index a740575e963..26f08c4cffc 100644 --- a/pkg/kubeapiserver/authenticator/BUILD +++ b/pkg/kubeapiserver/authenticator/BUILD @@ -30,9 +30,9 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authentication/request/x509", "//vendor:k8s.io/apiserver/pkg/authentication/token/tokenfile", "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/plugin/pkg/client/auth/gcp", "//vendor:k8s.io/client-go/plugin/pkg/client/auth/oidc", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/pkg/kubeapiserver/authenticator/config.go b/pkg/kubeapiserver/authenticator/config.go index 07303a5b22e..2a892232942 100644 --- a/pkg/kubeapiserver/authenticator/config.go +++ b/pkg/kubeapiserver/authenticator/config.go @@ -30,7 +30,7 @@ import ( "k8s.io/apiserver/pkg/authentication/request/x509" "k8s.io/apiserver/pkg/authentication/token/tokenfile" "k8s.io/apiserver/pkg/authentication/user" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator" "k8s.io/kubernetes/pkg/serviceaccount" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/keystone" diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index f1fd1c04803..da5728874ed 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -109,9 +109,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation", "//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", + "//vendor:k8s.io/client-go/util/integer", + "//vendor:k8s.io/client-go/util/jsonpath", ], ) @@ -181,8 +181,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 5d64492e5a4..6d7e7a8b0be 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -61,9 +61,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/homedir", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/clientcmd", + "//vendor:k8s.io/client-go/util/homedir", ], ) diff --git a/pkg/kubectl/cmd/util/factory_client_access.go b/pkg/kubectl/cmd/util/factory_client_access.go index 5738e205a69..a8358902e3f 100644 --- a/pkg/kubectl/cmd/util/factory_client_access.go +++ b/pkg/kubectl/cmd/util/factory_client_access.go @@ -35,9 +35,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/pkg/util/homedir" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + "k8s.io/client-go/util/homedir" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/service" diff --git a/pkg/kubectl/custom_column_printer.go b/pkg/kubectl/custom_column_printer.go index b8059c85d74..114a375f565 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/client-go/pkg/util/jsonpath" + "k8s.io/client-go/util/jsonpath" ) const ( diff --git a/pkg/kubectl/resource/BUILD b/pkg/kubectl/resource/BUILD index 520f41ad957..d1f94936780 100644 --- a/pkg/kubectl/resource/BUILD +++ b/pkg/kubectl/resource/BUILD @@ -74,8 +74,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest/watch", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index 2329a25f6f3..aa46b4ae97a 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer/streaming" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/watch" - utiltesting "k8s.io/client-go/pkg/util/testing" restclientwatch "k8s.io/client-go/rest/watch" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 3971ff539f4..41cde6939a9 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -38,7 +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/client-go/util/jsonpath" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/events" diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 0e798f47c8a..31d1db21568 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/integer" + "k8s.io/client-go/util/integer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" diff --git a/pkg/kubectl/secret_for_tls_test.go b/pkg/kubectl/secret_for_tls_test.go index 29ae9710ce5..be7a82d2419 100644 --- a/pkg/kubectl/secret_for_tls_test.go +++ b/pkg/kubectl/secret_for_tls_test.go @@ -24,7 +24,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" ) diff --git a/pkg/kubectl/sorting_printer.go b/pkg/kubectl/sorting_printer.go index c003d399708..2aa12bb66c3 100644 --- a/pkg/kubectl/sorting_printer.go +++ b/pkg/kubectl/sorting_printer.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "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/client-go/util/integer" + "k8s.io/client-go/util/jsonpath" "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index aec09318ab8..b4d1ffa2e48 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -124,9 +124,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/kubernetes", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", - "//vendor:k8s.io/client-go/pkg/util/integer", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/flowcontrol", + "//vendor:k8s.io/client-go/util/integer", ], ) @@ -206,9 +206,9 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/flowcontrol", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubelet/active_deadline.go b/pkg/kubelet/active_deadline.go index 2e24c550301..4269016bd18 100644 --- a/pkg/kubelet/active_deadline.go +++ b/pkg/kubelet/active_deadline.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/lifecycle" diff --git a/pkg/kubelet/active_deadline_test.go b/pkg/kubelet/active_deadline_test.go index 894d99ff068..5a98270fd65 100644 --- a/pkg/kubelet/active_deadline_test.go +++ b/pkg/kubelet/active_deadline_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" ) diff --git a/pkg/kubelet/config/BUILD b/pkg/kubelet/config/BUILD index f6d850f5f41..e9a43b306b9 100644 --- a/pkg/kubelet/config/BUILD +++ b/pkg/kubelet/config/BUILD @@ -73,7 +73,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubelet/config/file_linux_test.go b/pkg/kubelet/config/file_linux_test.go index 6ecf128e7c3..c2091a72fe2 100644 --- a/pkg/kubelet/config/file_linux_test.go +++ b/pkg/kubelet/config/file_linux_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index 72b8c155e6a..794dbabf5ce 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/kubelet/container/BUILD b/pkg/kubelet/container/BUILD index ca9c55ff64f..f4d5cce4acb 100644 --- a/pkg/kubelet/container/BUILD +++ b/pkg/kubelet/container/BUILD @@ -42,7 +42,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index dab4f4ec21e..3997d02f756 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" "k8s.io/kubernetes/pkg/util/term" diff --git a/pkg/kubelet/container/testing/BUILD b/pkg/kubelet/container/testing/BUILD index 514e370d400..69db1832576 100644 --- a/pkg/kubelet/container/testing/BUILD +++ b/pkg/kubelet/container/testing/BUILD @@ -25,7 +25,7 @@ go_library( "//vendor:github.com/golang/mock/gomock", "//vendor:github.com/stretchr/testify/mock", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/kubelet/container/testing/fake_runtime.go b/pkg/kubelet/container/testing/fake_runtime.go index 1fcc55ccbdf..5ae3f2fd65b 100644 --- a/pkg/kubelet/container/testing/fake_runtime.go +++ b/pkg/kubelet/container/testing/fake_runtime.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" . "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/util/term" diff --git a/pkg/kubelet/container/testing/runtime_mock.go b/pkg/kubelet/container/testing/runtime_mock.go index 32992f5ebbc..a3a0115c99c 100644 --- a/pkg/kubelet/container/testing/runtime_mock.go +++ b/pkg/kubelet/container/testing/runtime_mock.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/mock" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" . "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/util/term" diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index 1cece35dd4b..03e8ce191e7 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/pkg/kubelet/dockershim/BUILD @@ -82,7 +82,7 @@ go_test( "//vendor:github.com/golang/mock/gomock", "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/kubelet/dockershim/docker_service_test.go b/pkg/kubelet/dockershim/docker_service_test.go index 776a86f6595..fa6401b57f4 100644 --- a/pkg/kubelet/dockershim/docker_service_test.go +++ b/pkg/kubelet/dockershim/docker_service_test.go @@ -24,7 +24,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/dockertools" diff --git a/pkg/kubelet/dockertools/BUILD b/pkg/kubelet/dockertools/BUILD index 25bf8539af0..2eca4d90708 100644 --- a/pkg/kubelet/dockertools/BUILD +++ b/pkg/kubelet/dockertools/BUILD @@ -76,8 +76,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -134,8 +134,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index d972dea1990..bcffc2b8589 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -48,7 +48,7 @@ import ( kubetypes "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/kubelet/dockertools/docker_manager_test.go b/pkg/kubelet/dockertools/docker_manager_test.go index 4957757135c..c9a9e62b6ad 100644 --- a/pkg/kubelet/dockertools/docker_manager_test.go +++ b/pkg/kubelet/dockertools/docker_manager_test.go @@ -41,8 +41,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" kubetypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/clock" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/kubelet/dockertools/fake_docker_client.go b/pkg/kubelet/dockertools/fake_docker_client.go index 433df3ba1be..b94d9acf21a 100644 --- a/pkg/kubelet/dockertools/fake_docker_client.go +++ b/pkg/kubelet/dockertools/fake_docker_client.go @@ -28,7 +28,7 @@ import ( dockertypes "github.com/docker/engine-api/types" dockercontainer "github.com/docker/engine-api/types/container" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/pkg/kubelet/dockertools/fake_manager.go b/pkg/kubelet/dockertools/fake_manager.go index e71f1027045..d762950646e 100644 --- a/pkg/kubelet/dockertools/fake_manager.go +++ b/pkg/kubelet/dockertools/fake_manager.go @@ -19,7 +19,7 @@ package dockertools import ( cadvisorapi "github.com/google/cadvisor/info/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/eviction/BUILD b/pkg/kubelet/eviction/BUILD index 7141109e4bd..950cc678dff 100644 --- a/pkg/kubelet/eviction/BUILD +++ b/pkg/kubelet/eviction/BUILD @@ -37,7 +37,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -60,7 +60,7 @@ go_test( "//pkg/quota:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/kubelet/eviction/eviction_manager.go b/pkg/kubelet/eviction/eviction_manager.go index 74e71a3dfed..5ee7be7cfff 100644 --- a/pkg/kubelet/eviction/eviction_manager.go +++ b/pkg/kubelet/eviction/eviction_manager.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/kubelet/eviction/eviction_manager_test.go b/pkg/kubelet/eviction/eviction_manager_test.go index c86cde42d75..4f4954cf01d 100644 --- a/pkg/kubelet/eviction/eviction_manager_test.go +++ b/pkg/kubelet/eviction/eviction_manager_test.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/kubelet/images/BUILD b/pkg/kubelet/images/BUILD index 4fd24acb5c3..85145e5cbd2 100644 --- a/pkg/kubelet/images/BUILD +++ b/pkg/kubelet/images/BUILD @@ -31,7 +31,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -53,8 +53,8 @@ go_test( "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/kubelet/images/helpers.go b/pkg/kubelet/images/helpers.go index d63ebd37b8e..da3cc2147e1 100644 --- a/pkg/kubelet/images/helpers.go +++ b/pkg/kubelet/images/helpers.go @@ -19,7 +19,7 @@ package images import ( "fmt" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/images/image_gc_manager_test.go b/pkg/kubelet/images/image_gc_manager_test.go index c2901a80532..4ef7ff4e108 100644 --- a/pkg/kubelet/images/image_gc_manager_test.go +++ b/pkg/kubelet/images/image_gc_manager_test.go @@ -24,7 +24,7 @@ import ( cadvisorapiv2 "github.com/google/cadvisor/info/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/client/record" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/images/image_manager.go b/pkg/kubelet/images/image_manager.go index 7162f385bb6..a6180913145 100644 --- a/pkg/kubelet/images/image_manager.go +++ b/pkg/kubelet/images/image_manager.go @@ -21,7 +21,7 @@ import ( dockerref "github.com/docker/distribution/reference" "github.com/golang/glog" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/images/image_manager_test.go b/pkg/kubelet/images/image_manager_test.go index ed00922ae93..a4cb9a3e351 100644 --- a/pkg/kubelet/images/image_manager_test.go +++ b/pkg/kubelet/images/image_manager_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/util/clock" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/clock" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" . "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 86b8255ffbc..43bc49608ff 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -41,9 +41,9 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" - "k8s.io/client-go/pkg/util/flowcontrol" - "k8s.io/client-go/pkg/util/integer" + "k8s.io/client-go/util/clock" + "k8s.io/client-go/util/flowcontrol" + "k8s.io/client-go/util/integer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index a37a172331f..fcbb6588576 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -33,8 +33,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/clock" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" diff --git a/pkg/kubelet/kuberuntime/BUILD b/pkg/kubelet/kuberuntime/BUILD index 6861064cfed..ca40508f977 100644 --- a/pkg/kubelet/kuberuntime/BUILD +++ b/pkg/kubelet/kuberuntime/BUILD @@ -59,7 +59,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -93,7 +93,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go b/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go index c7c6b8fd64f..78d5146393b 100644 --- a/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go @@ -24,7 +24,7 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "k8s.io/apimachinery/pkg/types" kubetypes "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/credentialprovider" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 72449a2f94e..9100e907d2b 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubetypes "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/credentialprovider" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index 0f0f3e9fc68..a08b5d55de8 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" kubetypes "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" apitest "k8s.io/kubernetes/pkg/kubelet/api/testing" diff --git a/pkg/kubelet/network/cni/BUILD b/pkg/kubelet/network/cni/BUILD index b364cd4b998..c3dbf3b9733 100644 --- a/pkg/kubelet/network/cni/BUILD +++ b/pkg/kubelet/network/cni/BUILD @@ -40,7 +40,7 @@ go_test( "//pkg/util/exec:go_default_library", "//vendor:github.com/containernetworking/cni/pkg/types", "//vendor:github.com/stretchr/testify/mock", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubelet/network/cni/cni_test.go b/pkg/kubelet/network/cni/cni_test.go index c5859f1c446..c2c8a1e73de 100644 --- a/pkg/kubelet/network/cni/cni_test.go +++ b/pkg/kubelet/network/cni/cni_test.go @@ -31,7 +31,7 @@ import ( cnitypes "github.com/containernetworking/cni/pkg/types" "github.com/stretchr/testify/mock" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/pkg/kubelet/pleg/BUILD b/pkg/kubelet/pleg/BUILD index 8480566837b..041a0664730 100644 --- a/pkg/kubelet/pleg/BUILD +++ b/pkg/kubelet/pleg/BUILD @@ -23,7 +23,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -38,7 +38,7 @@ go_test( "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/kubelet/pleg/generic.go b/pkg/kubelet/pleg/generic.go index 63a0cba42cd..4f6e66b0f3a 100644 --- a/pkg/kubelet/pleg/generic.go +++ b/pkg/kubelet/pleg/generic.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/metrics" ) diff --git a/pkg/kubelet/pleg/generic_test.go b/pkg/kubelet/pleg/generic_test.go index d38cf2e309c..36df346039b 100644 --- a/pkg/kubelet/pleg/generic_test.go +++ b/pkg/kubelet/pleg/generic_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/pod_workers_test.go b/pkg/kubelet/pod_workers_test.go index 830c095985a..f337dd24daa 100644 --- a/pkg/kubelet/pod_workers_test.go +++ b/pkg/kubelet/pod_workers_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/rkt/BUILD b/pkg/kubelet/rkt/BUILD index 051e5daf0ec..b192bdfbd25 100644 --- a/pkg/kubelet/rkt/BUILD +++ b/pkg/kubelet/rkt/BUILD @@ -57,7 +57,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -91,7 +91,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index f9d56cf7e47..974bc25e19b 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -45,7 +45,7 @@ import ( kubetypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/errors" utilwait "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/credentialprovider" diff --git a/pkg/kubelet/rkt/rkt_test.go b/pkg/kubelet/rkt/rkt_test.go index a5ff05cc40c..29ef054eeb5 100644 --- a/pkg/kubelet/rkt/rkt_test.go +++ b/pkg/kubelet/rkt/rkt_test.go @@ -34,7 +34,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubetypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/errors" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/runonce_test.go b/pkg/kubelet/runonce_test.go index 50bf546df5a..1a1e39e90ab 100644 --- a/pkg/kubelet/runonce_test.go +++ b/pkg/kubelet/runonce_test.go @@ -25,8 +25,8 @@ import ( cadvisorapiv2 "github.com/google/cadvisor/info/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/clock" - utiltesting "k8s.io/client-go/pkg/util/testing" + "k8s.io/client-go/util/clock" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" diff --git a/pkg/kubelet/secret/BUILD b/pkg/kubelet/secret/BUILD index fc2a99bc232..0f5ee43320e 100644 --- a/pkg/kubelet/secret/BUILD +++ b/pkg/kubelet/secret/BUILD @@ -18,7 +18,7 @@ go_test( "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -36,7 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/kubelet/secret/secret_manager.go b/pkg/kubelet/secret/secret_manager.go index 1ca703c0405..be84d6f4f1a 100644 --- a/pkg/kubelet/secret/secret_manager.go +++ b/pkg/kubelet/secret/secret_manager.go @@ -28,7 +28,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) type Manager interface { diff --git a/pkg/kubelet/secret/secret_manager_test.go b/pkg/kubelet/secret/secret_manager_test.go index ad0b2985359..5fc5f06f574 100644 --- a/pkg/kubelet/secret/secret_manager_test.go +++ b/pkg/kubelet/secret/secret_manager_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "github.com/stretchr/testify/assert" ) diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 60ea8b89d9b..cb9dcc33061 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -80,7 +80,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 15f17763e93..a4d271861c8 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -44,7 +44,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/kubelet/cm" diff --git a/pkg/kubelet/server/streaming/BUILD b/pkg/kubelet/server/streaming/BUILD index 861bc41b314..405af5c0be6 100644 --- a/pkg/kubelet/server/streaming/BUILD +++ b/pkg/kubelet/server/streaming/BUILD @@ -25,7 +25,7 @@ go_library( "//vendor:google.golang.org/grpc", "//vendor:google.golang.org/grpc/codes", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -46,8 +46,8 @@ go_test( "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/kubelet/server/streaming/request_cache.go b/pkg/kubelet/server/streaming/request_cache.go index 5376b7d94d4..e663542d0f1 100644 --- a/pkg/kubelet/server/streaming/request_cache.go +++ b/pkg/kubelet/server/streaming/request_cache.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) var ( diff --git a/pkg/kubelet/server/streaming/request_cache_test.go b/pkg/kubelet/server/streaming/request_cache_test.go index a714a7149ae..c35f5d0b6be 100644 --- a/pkg/kubelet/server/streaming/request_cache_test.go +++ b/pkg/kubelet/server/streaming/request_cache_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func TestInsert(t *testing.T) { diff --git a/pkg/kubelet/util/cache/BUILD b/pkg/kubelet/util/cache/BUILD index 73868424b29..03c2107f7a2 100644 --- a/pkg/kubelet/util/cache/BUILD +++ b/pkg/kubelet/util/cache/BUILD @@ -22,7 +22,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/client/cache:go_default_library", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/kubelet/util/cache/object_cache_test.go b/pkg/kubelet/util/cache/object_cache_test.go index 1dc2d8861f3..ded4c1631b5 100644 --- a/pkg/kubelet/util/cache/object_cache_test.go +++ b/pkg/kubelet/util/cache/object_cache_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" expirationcache "k8s.io/kubernetes/pkg/client/cache" ) diff --git a/pkg/kubelet/util/csr/BUILD b/pkg/kubelet/util/csr/BUILD index 5dc685166d4..c8f5c938db0 100644 --- a/pkg/kubelet/util/csr/BUILD +++ b/pkg/kubelet/util/csr/BUILD @@ -18,7 +18,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/pkg/kubelet/util/csr/csr.go b/pkg/kubelet/util/csr/csr.go index 4d0a38dab37..a1848788a16 100644 --- a/pkg/kubelet/util/csr/csr.go +++ b/pkg/kubelet/util/csr/csr.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" certificatesclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" ) diff --git a/pkg/kubelet/util/queue/BUILD b/pkg/kubelet/util/queue/BUILD index 320f8c1ee66..f5cff71fca2 100644 --- a/pkg/kubelet/util/queue/BUILD +++ b/pkg/kubelet/util/queue/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -26,7 +26,7 @@ go_test( deps = [ "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/kubelet/util/queue/work_queue.go b/pkg/kubelet/util/queue/work_queue.go index e88d4079be6..63bbef1e7db 100644 --- a/pkg/kubelet/util/queue/work_queue.go +++ b/pkg/kubelet/util/queue/work_queue.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) // WorkQueue allows queuing items with a timestamp. An item is diff --git a/pkg/kubelet/util/queue/work_queue_test.go b/pkg/kubelet/util/queue/work_queue_test.go index 670c0b9aab6..56302aef0b8 100644 --- a/pkg/kubelet/util/queue/work_queue_test.go +++ b/pkg/kubelet/util/queue/work_queue_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func newTestBasicWorkQueue() (*basicWorkQueue, *clock.FakeClock) { diff --git a/pkg/kubelet/volumemanager/BUILD b/pkg/kubelet/volumemanager/BUILD index 64bc2058413..90d1bffa405 100644 --- a/pkg/kubelet/volumemanager/BUILD +++ b/pkg/kubelet/volumemanager/BUILD @@ -58,7 +58,7 @@ go_test( "//pkg/volume/util/volumehelper:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubelet/volumemanager/volume_manager_test.go b/pkg/kubelet/volumemanager/volume_manager_test.go index 9f209ab91f8..36a63c5f251 100644 --- a/pkg/kubelet/volumemanager/volume_manager_test.go +++ b/pkg/kubelet/volumemanager/volume_manager_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" diff --git a/pkg/master/tunneler/BUILD b/pkg/master/tunneler/BUILD index 78b1deea97d..0f73449f3b0 100644 --- a/pkg/master/tunneler/BUILD +++ b/pkg/master/tunneler/BUILD @@ -15,7 +15,7 @@ go_test( tags = ["automanaged"], deps = [ "//vendor:github.com/stretchr/testify/assert", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -29,7 +29,7 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/master/tunneler/ssh.go b/pkg/master/tunneler/ssh.go index 4ef2696d420..d05d377f825 100644 --- a/pkg/master/tunneler/ssh.go +++ b/pkg/master/tunneler/ssh.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/ssh" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/master/tunneler/ssh_test.go b/pkg/master/tunneler/ssh_test.go index 9f0918785f0..8026645b3f1 100644 --- a/pkg/master/tunneler/ssh_test.go +++ b/pkg/master/tunneler/ssh_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "github.com/stretchr/testify/assert" ) diff --git a/pkg/proxy/iptables/BUILD b/pkg/proxy/iptables/BUILD index f7f3853d918..7c2e7b87989 100644 --- a/pkg/proxy/iptables/BUILD +++ b/pkg/proxy/iptables/BUILD @@ -29,7 +29,7 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index c2b94072b83..41547bd8835 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -36,7 +36,7 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api" apiservice "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/storage/BUILD b/pkg/storage/BUILD index 634621ea9ea..97ed6f2eafc 100644 --- a/pkg/storage/BUILD +++ b/pkg/storage/BUILD @@ -40,7 +40,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -67,7 +67,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/storage/watch_cache.go b/pkg/storage/watch_cache.go index 2d71e0482ce..d55ca261a45 100644 --- a/pkg/storage/watch_cache.go +++ b/pkg/storage/watch_cache.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/storage/watch_cache_test.go b/pkg/storage/watch_cache_test.go index 26439a3674b..b84e008db7b 100644 --- a/pkg/storage/watch_cache_test.go +++ b/pkg/storage/watch_cache_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" ) diff --git a/pkg/util/io/BUILD b/pkg/util/io/BUILD index 996e04cf51a..2e8a73e6027 100644 --- a/pkg/util/io/BUILD +++ b/pkg/util/io/BUILD @@ -33,7 +33,7 @@ go_test( "//pkg/volume:go_default_library", "//vendor:github.com/pborman/uuid", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/util/io/io_test.go b/pkg/util/io/io_test.go index a91b532adfb..86b00394ee1 100644 --- a/pkg/util/io/io_test.go +++ b/pkg/util/io/io_test.go @@ -23,7 +23,7 @@ import ( "github.com/pborman/uuid" "k8s.io/apimachinery/pkg/runtime" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/util/metrics/BUILD b/pkg/util/metrics/BUILD index f6259fe1ac5..41664171b2b 100644 --- a/pkg/util/metrics/BUILD +++ b/pkg/util/metrics/BUILD @@ -15,7 +15,7 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/pkg/util/metrics/util.go b/pkg/util/metrics/util.go index 5ec67404474..e183be1d55e 100644 --- a/pkg/util/metrics/util.go +++ b/pkg/util/metrics/util.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/util/workqueue/BUILD b/pkg/util/workqueue/BUILD index 3ad45aa2013..74cc0efbaa2 100644 --- a/pkg/util/workqueue/BUILD +++ b/pkg/util/workqueue/BUILD @@ -24,7 +24,7 @@ go_library( deps = [ "//vendor:github.com/juju/ratelimit", "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -41,7 +41,7 @@ go_test( deps = [ "//pkg/api/v1:go_default_library", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/util/workqueue/delaying_queue.go b/pkg/util/workqueue/delaying_queue.go index 9203a8f3c41..593ad9ad415 100644 --- a/pkg/util/workqueue/delaying_queue.go +++ b/pkg/util/workqueue/delaying_queue.go @@ -21,7 +21,7 @@ import ( "time" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) // DelayingInterface is an Interface that can Add an item at a later time. This makes it easier to diff --git a/pkg/util/workqueue/delaying_queue_test.go b/pkg/util/workqueue/delaying_queue_test.go index 727949c1b23..1b7661064a2 100644 --- a/pkg/util/workqueue/delaying_queue_test.go +++ b/pkg/util/workqueue/delaying_queue_test.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func TestSimpleQueue(t *testing.T) { diff --git a/pkg/util/workqueue/rate_limitting_queue_test.go b/pkg/util/workqueue/rate_limitting_queue_test.go index f09d2ec9e9a..47100689d10 100644 --- a/pkg/util/workqueue/rate_limitting_queue_test.go +++ b/pkg/util/workqueue/rate_limitting_queue_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func TestRateLimitingQueue(t *testing.T) { diff --git a/pkg/volume/BUILD b/pkg/volume/BUILD index 9f1047c5781..874a004af9a 100644 --- a/pkg/volume/BUILD +++ b/pkg/volume/BUILD @@ -63,7 +63,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) @@ -74,7 +74,7 @@ go_test( deps = [ "//pkg/volume:go_default_library", "//pkg/volume/testing:go_default_library", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/aws_ebs/BUILD b/pkg/volume/aws_ebs/BUILD index 7e2bd18934c..cbcb608629e 100644 --- a/pkg/volume/aws_ebs/BUILD +++ b/pkg/volume/aws_ebs/BUILD @@ -51,7 +51,7 @@ go_test( "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/aws_ebs/aws_ebs_test.go b/pkg/volume/aws_ebs/aws_ebs_test.go index d3492348489..1f461afd9d7 100644 --- a/pkg/volume/aws_ebs/aws_ebs_test.go +++ b/pkg/volume/aws_ebs/aws_ebs_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" diff --git a/pkg/volume/azure_dd/BUILD b/pkg/volume/azure_dd/BUILD index b7880fad87f..373ead3aa7a 100644 --- a/pkg/volume/azure_dd/BUILD +++ b/pkg/volume/azure_dd/BUILD @@ -52,7 +52,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:github.com/Azure/azure-sdk-for-go/arm/compute", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/azure_dd/azure_dd_test.go b/pkg/volume/azure_dd/azure_dd_test.go index c4ab32e1c1e..db885c40f35 100644 --- a/pkg/volume/azure_dd/azure_dd_test.go +++ b/pkg/volume/azure_dd/azure_dd_test.go @@ -25,7 +25,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/compute" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/cephfs/BUILD b/pkg/volume/cephfs/BUILD index 7321b7e0bc8..47088522e73 100644 --- a/pkg/volume/cephfs/BUILD +++ b/pkg/volume/cephfs/BUILD @@ -38,7 +38,7 @@ go_test( "//pkg/volume:go_default_library", "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/cephfs/cephfs_test.go b/pkg/volume/cephfs/cephfs_test.go index 0d104b2e259..cc91f5b0446 100644 --- a/pkg/volume/cephfs/cephfs_test.go +++ b/pkg/volume/cephfs/cephfs_test.go @@ -22,7 +22,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/cinder/BUILD b/pkg/volume/cinder/BUILD index 6a5252d9ccd..cd92fe15836 100644 --- a/pkg/volume/cinder/BUILD +++ b/pkg/volume/cinder/BUILD @@ -51,7 +51,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/cinder/cinder_test.go b/pkg/volume/cinder/cinder_test.go index 754d317d7e4..7b1735fa695 100644 --- a/pkg/volume/cinder/cinder_test.go +++ b/pkg/volume/cinder/cinder_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/downwardapi/BUILD b/pkg/volume/downwardapi/BUILD index 345fd3d5b1a..4fd3da877e0 100644 --- a/pkg/volume/downwardapi/BUILD +++ b/pkg/volume/downwardapi/BUILD @@ -39,7 +39,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/downwardapi/downwardapi_test.go b/pkg/volume/downwardapi/downwardapi_test.go index c6933f460ea..e602ed20e44 100644 --- a/pkg/volume/downwardapi/downwardapi_test.go +++ b/pkg/volume/downwardapi/downwardapi_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" diff --git a/pkg/volume/empty_dir/BUILD b/pkg/volume/empty_dir/BUILD index cd901ede24b..80dd46fa046 100644 --- a/pkg/volume/empty_dir/BUILD +++ b/pkg/volume/empty_dir/BUILD @@ -41,7 +41,7 @@ go_test( "//pkg/volume/util:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/empty_dir/empty_dir_test.go b/pkg/volume/empty_dir/empty_dir_test.go index 4e2d91ba228..7308246d5e5 100644 --- a/pkg/volume/empty_dir/empty_dir_test.go +++ b/pkg/volume/empty_dir/empty_dir_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/fc/BUILD b/pkg/volume/fc/BUILD index 6ee4df3995e..fd9ac248e94 100644 --- a/pkg/volume/fc/BUILD +++ b/pkg/volume/fc/BUILD @@ -45,7 +45,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/fc/fc_test.go b/pkg/volume/fc/fc_test.go index b0447c19a16..3531740d0e3 100644 --- a/pkg/volume/fc/fc_test.go +++ b/pkg/volume/fc/fc_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/flexvolume/BUILD b/pkg/volume/flexvolume/BUILD index d735917b1aa..0c8f14d6599 100644 --- a/pkg/volume/flexvolume/BUILD +++ b/pkg/volume/flexvolume/BUILD @@ -41,7 +41,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/flexvolume/flexvolume_test.go b/pkg/volume/flexvolume/flexvolume_test.go index bb5eba0dfbd..95503604548 100644 --- a/pkg/volume/flexvolume/flexvolume_test.go +++ b/pkg/volume/flexvolume/flexvolume_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/flocker/BUILD b/pkg/volume/flocker/BUILD index 36a8f18aef9..869a346cdf9 100644 --- a/pkg/volume/flocker/BUILD +++ b/pkg/volume/flocker/BUILD @@ -51,7 +51,7 @@ go_test( "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/flocker/flocker_test.go b/pkg/volume/flocker/flocker_test.go index a7e8e13f342..ae8ce24327c 100644 --- a/pkg/volume/flocker/flocker_test.go +++ b/pkg/volume/flocker/flocker_test.go @@ -22,7 +22,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/flocker/flocker_volume_test.go b/pkg/volume/flocker/flocker_volume_test.go index 82c1bd20c83..8905b22ee40 100644 --- a/pkg/volume/flocker/flocker_volume_test.go +++ b/pkg/volume/flocker/flocker_volume_test.go @@ -22,7 +22,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" diff --git a/pkg/volume/gce_pd/BUILD b/pkg/volume/gce_pd/BUILD index 049b6db6e82..949df811424 100644 --- a/pkg/volume/gce_pd/BUILD +++ b/pkg/volume/gce_pd/BUILD @@ -51,7 +51,7 @@ go_test( "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/gce_pd/gce_pd_test.go b/pkg/volume/gce_pd/gce_pd_test.go index cc0f008c171..5cfe29509b7 100644 --- a/pkg/volume/gce_pd/gce_pd_test.go +++ b/pkg/volume/gce_pd/gce_pd_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/glusterfs/BUILD b/pkg/volume/glusterfs/BUILD index 9cdc2009b04..63ce7f8d54f 100644 --- a/pkg/volume/glusterfs/BUILD +++ b/pkg/volume/glusterfs/BUILD @@ -58,7 +58,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/glusterfs/glusterfs_test.go b/pkg/volume/glusterfs/glusterfs_test.go index eac4eff1fd8..a5fbe56f7a8 100644 --- a/pkg/volume/glusterfs/glusterfs_test.go +++ b/pkg/volume/glusterfs/glusterfs_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/volume/iscsi/BUILD b/pkg/volume/iscsi/BUILD index 867dbf651e3..d2406fdee1d 100644 --- a/pkg/volume/iscsi/BUILD +++ b/pkg/volume/iscsi/BUILD @@ -45,7 +45,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/iscsi/iscsi_test.go b/pkg/volume/iscsi/iscsi_test.go index 87d72d765bb..596a85d3acd 100644 --- a/pkg/volume/iscsi/iscsi_test.go +++ b/pkg/volume/iscsi/iscsi_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/metrics_du_test.go b/pkg/volume/metrics_du_test.go index 0238961764a..454564ac0b6 100644 --- a/pkg/volume/metrics_du_test.go +++ b/pkg/volume/metrics_du_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" . "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" ) diff --git a/pkg/volume/metrics_statfs_test.go b/pkg/volume/metrics_statfs_test.go index 5fde43ba5b6..369b96212fd 100644 --- a/pkg/volume/metrics_statfs_test.go +++ b/pkg/volume/metrics_statfs_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" ) func TestGetMetricsStatFS(t *testing.T) { diff --git a/pkg/volume/nfs/BUILD b/pkg/volume/nfs/BUILD index 260922e8de3..5e3eb5c2c08 100644 --- a/pkg/volume/nfs/BUILD +++ b/pkg/volume/nfs/BUILD @@ -42,7 +42,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/nfs/nfs_test.go b/pkg/volume/nfs/nfs_test.go index 3317eced1fb..ab136a0a7bd 100644 --- a/pkg/volume/nfs/nfs_test.go +++ b/pkg/volume/nfs/nfs_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/photon_pd/BUILD b/pkg/volume/photon_pd/BUILD index 15aa9432dc1..c964b6689d6 100644 --- a/pkg/volume/photon_pd/BUILD +++ b/pkg/volume/photon_pd/BUILD @@ -48,7 +48,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/photon_pd/photon_pd_test.go b/pkg/volume/photon_pd/photon_pd_test.go index f4b49276336..2d843542b7e 100644 --- a/pkg/volume/photon_pd/photon_pd_test.go +++ b/pkg/volume/photon_pd/photon_pd_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/quobyte/BUILD b/pkg/volume/quobyte/BUILD index b0f3a4595b9..ea356a92daa 100644 --- a/pkg/volume/quobyte/BUILD +++ b/pkg/volume/quobyte/BUILD @@ -45,7 +45,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/quobyte/quobyte_test.go b/pkg/volume/quobyte/quobyte_test.go index 6f9ea22f5c6..0a7b6320bc8 100644 --- a/pkg/volume/quobyte/quobyte_test.go +++ b/pkg/volume/quobyte/quobyte_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/rbd/BUILD b/pkg/volume/rbd/BUILD index b5a1dbe7e30..285efc7c1e8 100644 --- a/pkg/volume/rbd/BUILD +++ b/pkg/volume/rbd/BUILD @@ -46,7 +46,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/rbd/rbd_test.go b/pkg/volume/rbd/rbd_test.go index 3b702135c43..3ac2f0f3e61 100644 --- a/pkg/volume/rbd/rbd_test.go +++ b/pkg/volume/rbd/rbd_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/testing/BUILD b/pkg/volume/testing/BUILD index 63445abd2e8..fd3566106bf 100644 --- a/pkg/volume/testing/BUILD +++ b/pkg/volume/testing/BUILD @@ -27,7 +27,7 @@ go_library( "//vendor:github.com/stretchr/testify/mock", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/testing/testing.go b/pkg/volume/testing/testing.go index 69620c19732..ca8cad02dad 100644 --- a/pkg/volume/testing/testing.go +++ b/pkg/volume/testing/testing.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/pkg/volume/util/BUILD b/pkg/volume/util/BUILD index be34789fa4c..4ff3adc037e 100644 --- a/pkg/volume/util/BUILD +++ b/pkg/volume/util/BUILD @@ -42,7 +42,7 @@ go_test( tags = ["automanaged"], deps = [ "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/util/atomic_writer_test.go b/pkg/volume/util/atomic_writer_test.go index 6cec58a4180..f535e14940e 100644 --- a/pkg/volume/util/atomic_writer_test.go +++ b/pkg/volume/util/atomic_writer_test.go @@ -29,7 +29,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/util/sets" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" ) func TestNewAtomicWriter(t *testing.T) { diff --git a/pkg/volume/vsphere_volume/BUILD b/pkg/volume/vsphere_volume/BUILD index 02783fa01ec..c01ab8cd6e2 100644 --- a/pkg/volume/vsphere_volume/BUILD +++ b/pkg/volume/vsphere_volume/BUILD @@ -49,7 +49,7 @@ go_test( "//pkg/volume/testing:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/util/testing", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/vsphere_volume/vsphere_volume_test.go b/pkg/volume/vsphere_volume/vsphere_volume_test.go index 9455db4d092..a0b19ee2736 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_test.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/types" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/plugin/pkg/admission/namespace/lifecycle/BUILD b/plugin/pkg/admission/namespace/lifecycle/BUILD index cc15a0fa23f..9fc1a5a786c 100644 --- a/plugin/pkg/admission/namespace/lifecycle/BUILD +++ b/plugin/pkg/admission/namespace/lifecycle/BUILD @@ -24,7 +24,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/admission", "//vendor:k8s.io/apiserver/pkg/util/cache", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -45,7 +45,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go index a6c04a89f29..1747b0f5c0b 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" utilcache "k8s.io/apiserver/pkg/util/cache" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/plugin/pkg/admission/namespace/lifecycle/admission_test.go b/plugin/pkg/admission/namespace/lifecycle/admission_test.go index 71efd4f4e96..d64941c79d5 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission_test.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" diff --git a/plugin/pkg/auth/authenticator/password/keystone/BUILD b/plugin/pkg/auth/authenticator/password/keystone/BUILD index c007f2f3072..71b404e2737 100644 --- a/plugin/pkg/auth/authenticator/password/keystone/BUILD +++ b/plugin/pkg/auth/authenticator/password/keystone/BUILD @@ -20,7 +20,7 @@ go_library( "//vendor:github.com/rackspace/gophercloud/openstack", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/plugin/pkg/auth/authenticator/password/keystone/keystone.go b/plugin/pkg/auth/authenticator/password/keystone/keystone.go index 338c86f5478..730bc06cb29 100644 --- a/plugin/pkg/auth/authenticator/password/keystone/keystone.go +++ b/plugin/pkg/auth/authenticator/password/keystone/keystone.go @@ -27,7 +27,7 @@ import ( "github.com/rackspace/gophercloud/openstack" netutil "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/authentication/user" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" ) // KeystoneAuthenticator contacts openstack keystone to validate user's credentials passed in the request. diff --git a/plugin/pkg/auth/authenticator/token/oidc/BUILD b/plugin/pkg/auth/authenticator/token/oidc/BUILD index 52295271061..62d38d4303a 100644 --- a/plugin/pkg/auth/authenticator/token/oidc/BUILD +++ b/plugin/pkg/auth/authenticator/token/oidc/BUILD @@ -19,7 +19,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) diff --git a/plugin/pkg/auth/authenticator/token/oidc/oidc.go b/plugin/pkg/auth/authenticator/token/oidc/oidc.go index 777fc0e95fd..1b6e8f31c3e 100644 --- a/plugin/pkg/auth/authenticator/token/oidc/oidc.go +++ b/plugin/pkg/auth/authenticator/token/oidc/oidc.go @@ -42,7 +42,7 @@ import ( "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/authentication/user" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" ) type OIDCOptions struct { diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD b/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD index 0bc394ffe5e..c1c9dc28093 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD +++ b/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD @@ -40,8 +40,8 @@ go_test( "//plugin/pkg/scheduler/factory:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go b/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go index 3f73a1f50df..df5844cf9b5 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go +++ b/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/plugin/pkg/scheduler/factory/BUILD b/plugin/pkg/scheduler/factory/BUILD index e88651b9461..969be7b6eb7 100644 --- a/plugin/pkg/scheduler/factory/BUILD +++ b/plugin/pkg/scheduler/factory/BUILD @@ -64,8 +64,8 @@ go_test( "//plugin/pkg/scheduler/util:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/plugin/pkg/scheduler/factory/factory_test.go index 04d419eec34..6980a9df694 100644 --- a/plugin/pkg/scheduler/factory/factory_test.go +++ b/plugin/pkg/scheduler/factory/factory_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - utiltesting "k8s.io/client-go/pkg/util/testing" restclient "k8s.io/client-go/rest" + utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" diff --git a/staging/copy.sh b/staging/copy.sh index 4edc341cbe4..30b4c611c4e 100755 --- a/staging/copy.sh +++ b/staging/copy.sh @@ -77,14 +77,8 @@ save "tools/clientcmd" save "tools/metrics" save "transport" save "pkg/third_party" -save "pkg/util/cert" -save "pkg/util/clock" -save "pkg/util/flowcontrol" -save "pkg/util/homedir" -save "pkg/util/integer" -save "pkg/util/jsonpath" -save "pkg/util/testing" save "plugin" +save "util" diff --git a/staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go index 7b515c351ca..3c34db62224 100644 --- a/staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go +++ b/staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go @@ -27,7 +27,7 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" x509request "k8s.io/apiserver/pkg/authentication/request/x509" "k8s.io/apiserver/pkg/authentication/user" - utilcert "k8s.io/client-go/pkg/util/cert" + utilcert "k8s.io/client-go/util/cert" ) type requestHeaderAuthRequestHandler struct { diff --git a/staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go b/staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go index 90b394d6ffa..4990f56ca40 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" "github.com/golang/groupcache/lru" ) diff --git a/staging/src/k8s.io/client-go/dynamic/client.go b/staging/src/k8s.io/client-go/dynamic/client.go index 75771dfa438..8fad7ce9df9 100644 --- a/staging/src/k8s.io/client-go/dynamic/client.go +++ b/staging/src/k8s.io/client-go/dynamic/client.go @@ -36,8 +36,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util/flowcontrol" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/flowcontrol" ) // Client is a Kubernetes client that allows you to access metadata diff --git a/staging/src/k8s.io/client-go/kubernetes/clientset.go b/staging/src/k8s.io/client-go/kubernetes/clientset.go index c509033402d..5e0c99ec7f2 100644 --- a/staging/src/k8s.io/client-go/kubernetes/clientset.go +++ b/staging/src/k8s.io/client-go/kubernetes/clientset.go @@ -32,9 +32,9 @@ import ( v1alpha1rbac "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1" v1beta1rbac "k8s.io/client-go/kubernetes/typed/rbac/v1beta1" v1beta1storage "k8s.io/client-go/kubernetes/typed/storage/v1beta1" - "k8s.io/client-go/pkg/util/flowcontrol" _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" + "k8s.io/client-go/util/flowcontrol" ) type Interface interface { diff --git a/staging/src/k8s.io/client-go/pkg/util/workqueue/delaying_queue.go b/staging/src/k8s.io/client-go/pkg/util/workqueue/delaying_queue.go index 9203a8f3c41..593ad9ad415 100644 --- a/staging/src/k8s.io/client-go/pkg/util/workqueue/delaying_queue.go +++ b/staging/src/k8s.io/client-go/pkg/util/workqueue/delaying_queue.go @@ -21,7 +21,7 @@ import ( "time" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) // DelayingInterface is an Interface that can Add an item at a later time. This makes it easier to diff --git a/staging/src/k8s.io/client-go/pkg/util/workqueue/delaying_queue_test.go b/staging/src/k8s.io/client-go/pkg/util/workqueue/delaying_queue_test.go index 727949c1b23..1b7661064a2 100644 --- a/staging/src/k8s.io/client-go/pkg/util/workqueue/delaying_queue_test.go +++ b/staging/src/k8s.io/client-go/pkg/util/workqueue/delaying_queue_test.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func TestSimpleQueue(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/pkg/util/workqueue/rate_limitting_queue_test.go b/staging/src/k8s.io/client-go/pkg/util/workqueue/rate_limitting_queue_test.go index f09d2ec9e9a..47100689d10 100644 --- a/staging/src/k8s.io/client-go/pkg/util/workqueue/rate_limitting_queue_test.go +++ b/staging/src/k8s.io/client-go/pkg/util/workqueue/rate_limitting_queue_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func TestRateLimitingQueue(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp.go b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp.go index a891fd575c1..ac9faf46c8e 100644 --- a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp.go +++ b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp.go @@ -31,8 +31,8 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/google" "k8s.io/apimachinery/pkg/util/yaml" - "k8s.io/client-go/pkg/util/jsonpath" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/jsonpath" ) func init() { diff --git a/staging/src/k8s.io/client-go/rest/client.go b/staging/src/k8s.io/client-go/rest/client.go index 92e7a422877..524e0d8eb97 100644 --- a/staging/src/k8s.io/client-go/rest/client.go +++ b/staging/src/k8s.io/client-go/rest/client.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" ) const ( diff --git a/staging/src/k8s.io/client-go/rest/client_test.go b/staging/src/k8s.io/client-go/rest/client_test.go index be961fc7ad6..51dd61b92ad 100644 --- a/staging/src/k8s.io/client-go/rest/client_test.go +++ b/staging/src/k8s.io/client-go/rest/client_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/testapi" - utiltesting "k8s.io/client-go/pkg/util/testing" + utiltesting "k8s.io/client-go/util/testing" ) type TestParam struct { diff --git a/staging/src/k8s.io/client-go/rest/config.go b/staging/src/k8s.io/client-go/rest/config.go index 53a2385ca74..e491d0b1fc9 100644 --- a/staging/src/k8s.io/client-go/rest/config.go +++ b/staging/src/k8s.io/client-go/rest/config.go @@ -33,10 +33,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/pkg/api" - certutil "k8s.io/client-go/pkg/util/cert" - "k8s.io/client-go/pkg/util/flowcontrol" "k8s.io/client-go/pkg/version" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + certutil "k8s.io/client-go/util/cert" + "k8s.io/client-go/util/flowcontrol" ) const ( diff --git a/staging/src/k8s.io/client-go/rest/config_test.go b/staging/src/k8s.io/client-go/rest/config_test.go index 1447ab67611..e1ee26b47f4 100644 --- a/staging/src/k8s.io/client-go/rest/config_test.go +++ b/staging/src/k8s.io/client-go/rest/config_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/testapi" - "k8s.io/client-go/pkg/util/flowcontrol" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/client-go/util/flowcontrol" ) func TestIsConfigTransportTLS(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/rest/fake/fake.go b/staging/src/k8s.io/client-go/rest/fake/fake.go index f3447f44721..8903a458a3c 100644 --- a/staging/src/k8s.io/client-go/rest/fake/fake.go +++ b/staging/src/k8s.io/client-go/rest/fake/fake.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/testapi" - "k8s.io/client-go/pkg/util/flowcontrol" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/flowcontrol" ) func CreateHTTPClient(roundTripper func(*http.Request) (*http.Response, error)) *http.Client { diff --git a/staging/src/k8s.io/client-go/rest/request.go b/staging/src/k8s.io/client-go/rest/request.go index 875dd6c7f3f..7641af32d9c 100644 --- a/staging/src/k8s.io/client-go/rest/request.go +++ b/staging/src/k8s.io/client-go/rest/request.go @@ -44,9 +44,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util/flowcontrol" restclientwatch "k8s.io/client-go/rest/watch" "k8s.io/client-go/tools/metrics" + "k8s.io/client-go/util/flowcontrol" ) var ( diff --git a/staging/src/k8s.io/client-go/rest/request_test.go b/staging/src/k8s.io/client-go/rest/request_test.go index 7de9a26f4af..e7b68c0e046 100755 --- a/staging/src/k8s.io/client-go/rest/request_test.go +++ b/staging/src/k8s.io/client-go/rest/request_test.go @@ -45,12 +45,12 @@ import ( "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/testapi" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util/clock" - "k8s.io/client-go/pkg/util/flowcontrol" "k8s.io/client-go/pkg/util/httpstream" "k8s.io/client-go/pkg/util/intstr" - utiltesting "k8s.io/client-go/pkg/util/testing" restclientwatch "k8s.io/client-go/rest/watch" + "k8s.io/client-go/util/clock" + "k8s.io/client-go/util/flowcontrol" + utiltesting "k8s.io/client-go/util/testing" ) func TestNewRequestSetsAccept(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/rest/urlbackoff.go b/staging/src/k8s.io/client-go/rest/urlbackoff.go index 3ccb2140521..eff848abc12 100644 --- a/staging/src/k8s.io/client-go/rest/urlbackoff.go +++ b/staging/src/k8s.io/client-go/rest/urlbackoff.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" ) // Set of resp. Codes that we backoff for. diff --git a/staging/src/k8s.io/client-go/rest/urlbackoff_test.go b/staging/src/k8s.io/client-go/rest/urlbackoff_test.go index c01d40c7402..c5f439238d6 100644 --- a/staging/src/k8s.io/client-go/rest/urlbackoff_test.go +++ b/staging/src/k8s.io/client-go/rest/urlbackoff_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/util/flowcontrol" + "k8s.io/client-go/util/flowcontrol" ) func parse(raw string) *url.URL { diff --git a/staging/src/k8s.io/client-go/tools/cache/expiration_cache.go b/staging/src/k8s.io/client-go/tools/cache/expiration_cache.go index 10d68c533af..befac1c758d 100644 --- a/staging/src/k8s.io/client-go/tools/cache/expiration_cache.go +++ b/staging/src/k8s.io/client-go/tools/cache/expiration_cache.go @@ -21,7 +21,7 @@ import ( "time" "github.com/golang/glog" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) // ExpirationCache implements the store interface diff --git a/staging/src/k8s.io/client-go/tools/cache/expiration_cache_fakes.go b/staging/src/k8s.io/client-go/tools/cache/expiration_cache_fakes.go index e4d4063c44b..ab2f57687ef 100644 --- a/staging/src/k8s.io/client-go/tools/cache/expiration_cache_fakes.go +++ b/staging/src/k8s.io/client-go/tools/cache/expiration_cache_fakes.go @@ -18,7 +18,7 @@ package cache import ( "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) type fakeThreadSafeMap struct { diff --git a/staging/src/k8s.io/client-go/tools/cache/expiration_cache_test.go b/staging/src/k8s.io/client-go/tools/cache/expiration_cache_test.go index 0938e9fc128..17139d5940c 100644 --- a/staging/src/k8s.io/client-go/tools/cache/expiration_cache_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/expiration_cache_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func TestTTLExpirationBasic(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/loader.go b/staging/src/k8s.io/client-go/tools/clientcmd/loader.go index 9d8b6592c54..1fcc5103825 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/loader.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/loader.go @@ -33,10 +33,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" - "k8s.io/client-go/pkg/util/homedir" restclient "k8s.io/client-go/rest" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdlatest "k8s.io/client-go/tools/clientcmd/api/latest" + "k8s.io/client-go/util/homedir" ) const ( diff --git a/staging/src/k8s.io/client-go/tools/record/event.go b/staging/src/k8s.io/client-go/tools/record/event.go index 4c035c9ccd5..154cb288bb0 100644 --- a/staging/src/k8s.io/client-go/tools/record/event.go +++ b/staging/src/k8s.io/client-go/tools/record/event.go @@ -27,8 +27,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util/clock" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/clock" "net/http" diff --git a/staging/src/k8s.io/client-go/tools/record/event_test.go b/staging/src/k8s.io/client-go/tools/record/event_test.go index 60bc928eed4..7d3f38dcf6b 100644 --- a/staging/src/k8s.io/client-go/tools/record/event_test.go +++ b/staging/src/k8s.io/client-go/tools/record/event_test.go @@ -30,9 +30,9 @@ import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" _ "k8s.io/client-go/pkg/api/install" // To register api.Pod used in tests below "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util/clock" "k8s.io/client-go/pkg/util/strategicpatch" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/clock" ) type testEventSink struct { diff --git a/staging/src/k8s.io/client-go/tools/record/events_cache.go b/staging/src/k8s.io/client-go/tools/record/events_cache.go index abb03ebbab1..0fe1a38d02c 100644 --- a/staging/src/k8s.io/client-go/tools/record/events_cache.go +++ b/staging/src/k8s.io/client-go/tools/record/events_cache.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util/clock" "k8s.io/client-go/pkg/util/strategicpatch" + "k8s.io/client-go/util/clock" ) const ( diff --git a/staging/src/k8s.io/client-go/tools/record/events_cache_test.go b/staging/src/k8s.io/client-go/tools/record/events_cache_test.go index 1b60cb66437..b6b52881cd9 100644 --- a/staging/src/k8s.io/client-go/tools/record/events_cache_test.go +++ b/staging/src/k8s.io/client-go/tools/record/events_cache_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func makeObjectReference(kind, name, namespace string) v1.ObjectReference { diff --git a/staging/src/k8s.io/client-go/pkg/util/cert/cert.go b/staging/src/k8s.io/client-go/util/cert/cert.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/cert/cert.go rename to staging/src/k8s.io/client-go/util/cert/cert.go diff --git a/staging/src/k8s.io/client-go/pkg/util/cert/csr.go b/staging/src/k8s.io/client-go/util/cert/csr.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/cert/csr.go rename to staging/src/k8s.io/client-go/util/cert/csr.go diff --git a/staging/src/k8s.io/client-go/pkg/util/cert/csr_test.go b/staging/src/k8s.io/client-go/util/cert/csr_test.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/cert/csr_test.go rename to staging/src/k8s.io/client-go/util/cert/csr_test.go diff --git a/staging/src/k8s.io/client-go/pkg/util/cert/io.go b/staging/src/k8s.io/client-go/util/cert/io.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/cert/io.go rename to staging/src/k8s.io/client-go/util/cert/io.go diff --git a/staging/src/k8s.io/client-go/pkg/util/cert/pem.go b/staging/src/k8s.io/client-go/util/cert/pem.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/cert/pem.go rename to staging/src/k8s.io/client-go/util/cert/pem.go diff --git a/staging/src/k8s.io/client-go/pkg/util/cert/testdata/dontUseThisKey.pem b/staging/src/k8s.io/client-go/util/cert/testdata/dontUseThisKey.pem similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/cert/testdata/dontUseThisKey.pem rename to staging/src/k8s.io/client-go/util/cert/testdata/dontUseThisKey.pem diff --git a/staging/src/k8s.io/client-go/pkg/util/cert/triple/triple.go b/staging/src/k8s.io/client-go/util/cert/triple/triple.go similarity index 98% rename from staging/src/k8s.io/client-go/pkg/util/cert/triple/triple.go rename to staging/src/k8s.io/client-go/util/cert/triple/triple.go index 8719b82e312..b89ef7240f4 100644 --- a/staging/src/k8s.io/client-go/pkg/util/cert/triple/triple.go +++ b/staging/src/k8s.io/client-go/util/cert/triple/triple.go @@ -24,7 +24,7 @@ import ( "fmt" "net" - certutil "k8s.io/client-go/pkg/util/cert" + certutil "k8s.io/client-go/util/cert" ) type KeyPair struct { diff --git a/staging/src/k8s.io/client-go/pkg/util/clock/clock.go b/staging/src/k8s.io/client-go/util/clock/clock.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/clock/clock.go rename to staging/src/k8s.io/client-go/util/clock/clock.go diff --git a/staging/src/k8s.io/client-go/pkg/util/clock/clock_test.go b/staging/src/k8s.io/client-go/util/clock/clock_test.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/clock/clock_test.go rename to staging/src/k8s.io/client-go/util/clock/clock_test.go diff --git a/staging/src/k8s.io/client-go/pkg/util/flowcontrol/backoff.go b/staging/src/k8s.io/client-go/util/flowcontrol/backoff.go similarity index 98% rename from staging/src/k8s.io/client-go/pkg/util/flowcontrol/backoff.go rename to staging/src/k8s.io/client-go/util/flowcontrol/backoff.go index c3bf9582c7f..030b15a5608 100644 --- a/staging/src/k8s.io/client-go/pkg/util/flowcontrol/backoff.go +++ b/staging/src/k8s.io/client-go/util/flowcontrol/backoff.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "k8s.io/client-go/pkg/util/clock" - "k8s.io/client-go/pkg/util/integer" + "k8s.io/client-go/util/clock" + "k8s.io/client-go/util/integer" ) type backoffEntry struct { diff --git a/staging/src/k8s.io/client-go/pkg/util/flowcontrol/backoff_test.go b/staging/src/k8s.io/client-go/util/flowcontrol/backoff_test.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/util/flowcontrol/backoff_test.go rename to staging/src/k8s.io/client-go/util/flowcontrol/backoff_test.go index 9cd9bb5c297..5d1e41347f1 100644 --- a/staging/src/k8s.io/client-go/pkg/util/flowcontrol/backoff_test.go +++ b/staging/src/k8s.io/client-go/util/flowcontrol/backoff_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/util/clock" + "k8s.io/client-go/util/clock" ) func TestSlowBackoff(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/pkg/util/flowcontrol/throttle.go b/staging/src/k8s.io/client-go/util/flowcontrol/throttle.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/flowcontrol/throttle.go rename to staging/src/k8s.io/client-go/util/flowcontrol/throttle.go diff --git a/staging/src/k8s.io/client-go/pkg/util/flowcontrol/throttle_test.go b/staging/src/k8s.io/client-go/util/flowcontrol/throttle_test.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/flowcontrol/throttle_test.go rename to staging/src/k8s.io/client-go/util/flowcontrol/throttle_test.go diff --git a/staging/src/k8s.io/client-go/pkg/util/homedir/homedir.go b/staging/src/k8s.io/client-go/util/homedir/homedir.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/homedir/homedir.go rename to staging/src/k8s.io/client-go/util/homedir/homedir.go diff --git a/staging/src/k8s.io/client-go/pkg/util/integer/integer.go b/staging/src/k8s.io/client-go/util/integer/integer.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/integer/integer.go rename to staging/src/k8s.io/client-go/util/integer/integer.go diff --git a/staging/src/k8s.io/client-go/pkg/util/integer/integer_test.go b/staging/src/k8s.io/client-go/util/integer/integer_test.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/integer/integer_test.go rename to staging/src/k8s.io/client-go/util/integer/integer_test.go diff --git a/staging/src/k8s.io/client-go/pkg/util/jsonpath/doc.go b/staging/src/k8s.io/client-go/util/jsonpath/doc.go similarity index 92% rename from staging/src/k8s.io/client-go/pkg/util/jsonpath/doc.go rename to staging/src/k8s.io/client-go/util/jsonpath/doc.go index bdbd056c2f9..0effb15c411 100644 --- a/staging/src/k8s.io/client-go/pkg/util/jsonpath/doc.go +++ b/staging/src/k8s.io/client-go/util/jsonpath/doc.go @@ -17,4 +17,4 @@ limitations under the License. // package jsonpath is a template engine using jsonpath syntax, // which can be seen at http://goessner.net/articles/JsonPath/. // In addition, it has {range} {end} function to iterate list and slice. -package jsonpath // import "k8s.io/client-go/pkg/util/jsonpath" +package jsonpath // import "k8s.io/client-go/util/jsonpath" diff --git a/staging/src/k8s.io/client-go/pkg/util/jsonpath/jsonpath.go b/staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/jsonpath/jsonpath.go rename to staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go diff --git a/staging/src/k8s.io/client-go/pkg/util/jsonpath/jsonpath_test.go b/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/jsonpath/jsonpath_test.go rename to staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go diff --git a/staging/src/k8s.io/client-go/pkg/util/jsonpath/node.go b/staging/src/k8s.io/client-go/util/jsonpath/node.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/jsonpath/node.go rename to staging/src/k8s.io/client-go/util/jsonpath/node.go diff --git a/staging/src/k8s.io/client-go/pkg/util/jsonpath/parser.go b/staging/src/k8s.io/client-go/util/jsonpath/parser.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/jsonpath/parser.go rename to staging/src/k8s.io/client-go/util/jsonpath/parser.go diff --git a/staging/src/k8s.io/client-go/pkg/util/jsonpath/parser_test.go b/staging/src/k8s.io/client-go/util/jsonpath/parser_test.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/jsonpath/parser_test.go rename to staging/src/k8s.io/client-go/util/jsonpath/parser_test.go diff --git a/staging/src/k8s.io/client-go/pkg/util/testing/fake_handler.go b/staging/src/k8s.io/client-go/util/testing/fake_handler.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/testing/fake_handler.go rename to staging/src/k8s.io/client-go/util/testing/fake_handler.go diff --git a/staging/src/k8s.io/client-go/pkg/util/testing/fake_handler_test.go b/staging/src/k8s.io/client-go/util/testing/fake_handler_test.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/testing/fake_handler_test.go rename to staging/src/k8s.io/client-go/util/testing/fake_handler_test.go diff --git a/staging/src/k8s.io/client-go/pkg/util/testing/tmpdir.go b/staging/src/k8s.io/client-go/util/testing/tmpdir.go similarity index 100% rename from staging/src/k8s.io/client-go/pkg/util/testing/tmpdir.go rename to staging/src/k8s.io/client-go/util/testing/tmpdir.go diff --git a/test/e2e/BUILD b/test/e2e/BUILD index db0c4d87ca8..b6087fac7ba 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -194,10 +194,10 @@ go_library( "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/pkg/util/intstr", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/transport", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) diff --git a/test/e2e/service_latency.go b/test/e2e/service_latency.go index d61fc9b5989..868a9ddb725 100644 --- a/test/e2e/service_latency.go +++ b/test/e2e/service_latency.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/util/flowcontrol" restclient "k8s.io/client-go/rest" + "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/test/e2e/framework" diff --git a/vendor/BUILD b/vendor/BUILD index 8cf893c82be..6bef6ee8983 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -8832,7 +8832,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/request/x509", "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/client-go/pkg/util/cert", + "//vendor:k8s.io/client-go/util/cert", ], ) @@ -9095,7 +9095,7 @@ go_test( tags = ["automanaged"], deps = [ "//vendor:github.com/golang/groupcache/lru", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -10715,8 +10715,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -10756,9 +10756,9 @@ go_library( "//vendor:k8s.io/client-go/pkg/apis/policy/install", "//vendor:k8s.io/client-go/pkg/apis/rbac/install", "//vendor:k8s.io/client-go/pkg/apis/storage/install", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -12493,23 +12493,6 @@ go_library( deps = ["//vendor:github.com/golang/glog"], ) -go_library( - name = "k8s.io/client-go/pkg/util/cert", - srcs = [ - "k8s.io/client-go/pkg/util/cert/cert.go", - "k8s.io/client-go/pkg/util/cert/csr.go", - "k8s.io/client-go/pkg/util/cert/io.go", - "k8s.io/client-go/pkg/util/cert/pem.go", - ], - tags = ["automanaged"], -) - -go_library( - name = "k8s.io/client-go/pkg/util/clock", - srcs = ["k8s.io/client-go/pkg/util/clock/clock.go"], - tags = ["automanaged"], -) - go_library( name = "k8s.io/client-go/pkg/util/config", srcs = [ @@ -12527,26 +12510,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/util/flowcontrol", - srcs = [ - "k8s.io/client-go/pkg/util/flowcontrol/backoff.go", - "k8s.io/client-go/pkg/util/flowcontrol/throttle.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/juju/ratelimit", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/integer", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/util/homedir", - srcs = ["k8s.io/client-go/pkg/util/homedir/homedir.go"], - tags = ["automanaged"], -) - go_library( name = "k8s.io/client-go/pkg/util/httpstream", srcs = [ @@ -12576,12 +12539,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/util/integer", - srcs = ["k8s.io/client-go/pkg/util/integer/integer.go"], - tags = ["automanaged"], -) - go_library( name = "k8s.io/client-go/pkg/util/intstr", srcs = [ @@ -12598,18 +12555,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/util/jsonpath", - srcs = [ - "k8s.io/client-go/pkg/util/jsonpath/doc.go", - "k8s.io/client-go/pkg/util/jsonpath/jsonpath.go", - "k8s.io/client-go/pkg/util/jsonpath/node.go", - "k8s.io/client-go/pkg/util/jsonpath/parser.go", - ], - tags = ["automanaged"], - deps = ["//vendor:k8s.io/client-go/pkg/third_party/forked/golang/template"], -) - go_library( name = "k8s.io/client-go/pkg/util/labels", srcs = [ @@ -12639,15 +12584,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/util/testing", - srcs = [ - "k8s.io/client-go/pkg/util/testing/fake_handler.go", - "k8s.io/client-go/pkg/util/testing/tmpdir.go", - ], - tags = ["automanaged"], -) - go_test( name = "k8s.io/client-go/pkg/util/workqueue_test", srcs = [ @@ -12661,7 +12597,7 @@ go_test( deps = [ "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -12681,7 +12617,7 @@ go_library( deps = [ "//vendor:github.com/juju/ratelimit", "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/client-go/pkg/util/clock", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -12742,8 +12678,8 @@ go_library( "//vendor:golang.org/x/oauth2", "//vendor:golang.org/x/oauth2/google", "//vendor:k8s.io/apimachinery/pkg/util/yaml", - "//vendor:k8s.io/client-go/pkg/util/jsonpath", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/jsonpath", ], ) @@ -12799,13 +12735,13 @@ go_test( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/testapi", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/util/clock", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/pkg/util/httpstream", "//vendor:k8s.io/client-go/pkg/util/intstr", - "//vendor:k8s.io/client-go/pkg/util/testing", "//vendor:k8s.io/client-go/rest/watch", "//vendor:k8s.io/client-go/tools/clientcmd/api", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/flowcontrol", + "//vendor:k8s.io/client-go/util/testing", ], ) @@ -12837,13 +12773,13 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/util/cert", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/pkg/version", "//vendor:k8s.io/client-go/rest/watch", "//vendor:k8s.io/client-go/tools/clientcmd/api", "//vendor:k8s.io/client-go/tools/metrics", "//vendor:k8s.io/client-go/transport", + "//vendor:k8s.io/client-go/util/cert", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -12857,8 +12793,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/testapi", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/flowcontrol", ], ) @@ -12959,8 +12895,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/tools/cache/testing", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -13000,8 +12936,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -13078,11 +13014,11 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/util/homedir", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/auth", "//vendor:k8s.io/client-go/tools/clientcmd/api", "//vendor:k8s.io/client-go/tools/clientcmd/api/latest", + "//vendor:k8s.io/client-go/util/homedir", ], ) @@ -13177,9 +13113,9 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/client-go/pkg/api/install", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/pkg/util/strategicpatch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -13202,9 +13138,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/pkg/util/strategicpatch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/clock", ], ) @@ -13520,62 +13456,6 @@ go_library( deps = ["//vendor:k8s.io/apimachinery/pkg/selection"], ) -go_test( - name = "k8s.io/client-go/pkg/util/cert_test", - srcs = ["k8s.io/client-go/pkg/util/cert/csr_test.go"], - library = ":k8s.io/client-go/pkg/util/cert", - tags = ["automanaged"], -) - -go_library( - name = "k8s.io/client-go/pkg/util/cert/triple", - srcs = ["k8s.io/client-go/pkg/util/cert/triple/triple.go"], - tags = ["automanaged"], - deps = ["//vendor:k8s.io/client-go/pkg/util/cert"], -) - -go_test( - name = "k8s.io/client-go/pkg/util/clock_test", - srcs = ["k8s.io/client-go/pkg/util/clock/clock_test.go"], - library = ":k8s.io/client-go/pkg/util/clock", - tags = ["automanaged"], -) - -go_test( - name = "k8s.io/client-go/pkg/util/flowcontrol_test", - srcs = [ - "k8s.io/client-go/pkg/util/flowcontrol/backoff_test.go", - "k8s.io/client-go/pkg/util/flowcontrol/throttle_test.go", - ], - library = ":k8s.io/client-go/pkg/util/flowcontrol", - tags = ["automanaged"], - deps = ["//vendor:k8s.io/client-go/pkg/util/clock"], -) - -go_test( - name = "k8s.io/client-go/pkg/util/integer_test", - srcs = ["k8s.io/client-go/pkg/util/integer/integer_test.go"], - library = ":k8s.io/client-go/pkg/util/integer", - tags = ["automanaged"], -) - -go_test( - name = "k8s.io/client-go/pkg/util/testing_test", - srcs = ["k8s.io/client-go/pkg/util/testing/fake_handler_test.go"], - 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"], -) - go_test( name = "k8s.io/apimachinery/pkg/apimachinery/announced_test", srcs = ["k8s.io/apimachinery/pkg/apimachinery/announced/announced_test.go"], @@ -13745,3 +13625,123 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) + +go_test( + name = "k8s.io/client-go/util/cert_test", + srcs = ["k8s.io/client-go/util/cert/csr_test.go"], + library = ":k8s.io/client-go/util/cert", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/client-go/util/cert", + srcs = [ + "k8s.io/client-go/util/cert/cert.go", + "k8s.io/client-go/util/cert/csr.go", + "k8s.io/client-go/util/cert/io.go", + "k8s.io/client-go/util/cert/pem.go", + ], + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/client-go/util/cert/triple", + srcs = ["k8s.io/client-go/util/cert/triple/triple.go"], + tags = ["automanaged"], + deps = ["//vendor:k8s.io/client-go/util/cert"], +) + +go_test( + name = "k8s.io/client-go/util/clock_test", + srcs = ["k8s.io/client-go/util/clock/clock_test.go"], + library = ":k8s.io/client-go/util/clock", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/client-go/util/clock", + srcs = ["k8s.io/client-go/util/clock/clock.go"], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/client-go/util/flowcontrol_test", + srcs = [ + "k8s.io/client-go/util/flowcontrol/backoff_test.go", + "k8s.io/client-go/util/flowcontrol/throttle_test.go", + ], + library = ":k8s.io/client-go/util/flowcontrol", + tags = ["automanaged"], + deps = ["//vendor:k8s.io/client-go/util/clock"], +) + +go_library( + name = "k8s.io/client-go/util/flowcontrol", + srcs = [ + "k8s.io/client-go/util/flowcontrol/backoff.go", + "k8s.io/client-go/util/flowcontrol/throttle.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/juju/ratelimit", + "//vendor:k8s.io/client-go/util/clock", + "//vendor:k8s.io/client-go/util/integer", + ], +) + +go_library( + name = "k8s.io/client-go/util/homedir", + srcs = ["k8s.io/client-go/util/homedir/homedir.go"], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/client-go/util/integer_test", + srcs = ["k8s.io/client-go/util/integer/integer_test.go"], + library = ":k8s.io/client-go/util/integer", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/client-go/util/integer", + srcs = ["k8s.io/client-go/util/integer/integer.go"], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/client-go/util/jsonpath_test", + srcs = [ + "k8s.io/client-go/util/jsonpath/jsonpath_test.go", + "k8s.io/client-go/util/jsonpath/parser_test.go", + ], + library = ":k8s.io/client-go/util/jsonpath", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/client-go/util/jsonpath", + srcs = [ + "k8s.io/client-go/util/jsonpath/doc.go", + "k8s.io/client-go/util/jsonpath/jsonpath.go", + "k8s.io/client-go/util/jsonpath/node.go", + "k8s.io/client-go/util/jsonpath/parser.go", + ], + tags = ["automanaged"], + deps = ["//vendor:k8s.io/client-go/pkg/third_party/forked/golang/template"], +) + +go_test( + name = "k8s.io/client-go/util/testing_test", + srcs = ["k8s.io/client-go/util/testing/fake_handler_test.go"], + library = ":k8s.io/client-go/util/testing", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/client-go/util/testing", + srcs = [ + "k8s.io/client-go/util/testing/fake_handler.go", + "k8s.io/client-go/util/testing/tmpdir.go", + ], + tags = ["automanaged"], +)