diff --git a/dynamic/client.go b/dynamic/client.go index 75771dfa..8fad7ce9 100644 --- a/dynamic/client.go +++ b/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/kubernetes/clientset.go b/kubernetes/clientset.go index c5090334..5e0c99ec 100644 --- a/kubernetes/clientset.go +++ b/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/pkg/util/workqueue/delaying_queue.go b/pkg/util/workqueue/delaying_queue.go index 9203a8f3..593ad9ad 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 727949c1..1b766106 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 f09d2ec9..47100689 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/plugin/pkg/client/auth/gcp/gcp.go b/plugin/pkg/client/auth/gcp/gcp.go index a891fd57..ac9faf46 100644 --- a/plugin/pkg/client/auth/gcp/gcp.go +++ b/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/rest/client.go b/rest/client.go index 92e7a422..524e0d8e 100644 --- a/rest/client.go +++ b/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/rest/client_test.go b/rest/client_test.go index be961fc7..51dd61b9 100644 --- a/rest/client_test.go +++ b/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/rest/config.go b/rest/config.go index 53a2385c..e491d0b1 100644 --- a/rest/config.go +++ b/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/rest/config_test.go b/rest/config_test.go index 1447ab67..e1ee26b4 100644 --- a/rest/config_test.go +++ b/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/rest/fake/fake.go b/rest/fake/fake.go index f3447f44..8903a458 100644 --- a/rest/fake/fake.go +++ b/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/rest/request.go b/rest/request.go index 875dd6c7..7641af32 100644 --- a/rest/request.go +++ b/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/rest/request_test.go b/rest/request_test.go index 7de9a26f..e7b68c0e 100755 --- a/rest/request_test.go +++ b/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/rest/urlbackoff.go b/rest/urlbackoff.go index 3ccb2140..eff848ab 100644 --- a/rest/urlbackoff.go +++ b/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/rest/urlbackoff_test.go b/rest/urlbackoff_test.go index c01d40c7..c5f43923 100644 --- a/rest/urlbackoff_test.go +++ b/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/tools/cache/expiration_cache.go b/tools/cache/expiration_cache.go index 10d68c53..befac1c7 100644 --- a/tools/cache/expiration_cache.go +++ b/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/tools/cache/expiration_cache_fakes.go b/tools/cache/expiration_cache_fakes.go index e4d4063c..ab2f5768 100644 --- a/tools/cache/expiration_cache_fakes.go +++ b/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/tools/cache/expiration_cache_test.go b/tools/cache/expiration_cache_test.go index 0938e9fc..17139d59 100644 --- a/tools/cache/expiration_cache_test.go +++ b/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/tools/clientcmd/loader.go b/tools/clientcmd/loader.go index 9d8b6592..1fcc5103 100644 --- a/tools/clientcmd/loader.go +++ b/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/tools/record/event.go b/tools/record/event.go index 4c035c9c..154cb288 100644 --- a/tools/record/event.go +++ b/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/tools/record/event_test.go b/tools/record/event_test.go index 60bc928e..7d3f38dc 100644 --- a/tools/record/event_test.go +++ b/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/tools/record/events_cache.go b/tools/record/events_cache.go index abb03ebb..0fe1a38d 100644 --- a/tools/record/events_cache.go +++ b/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/tools/record/events_cache_test.go b/tools/record/events_cache_test.go index 1b60cb66..b6b52881 100644 --- a/tools/record/events_cache_test.go +++ b/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/pkg/util/cert/cert.go b/util/cert/cert.go similarity index 100% rename from pkg/util/cert/cert.go rename to util/cert/cert.go diff --git a/pkg/util/cert/csr.go b/util/cert/csr.go similarity index 100% rename from pkg/util/cert/csr.go rename to util/cert/csr.go diff --git a/pkg/util/cert/csr_test.go b/util/cert/csr_test.go similarity index 100% rename from pkg/util/cert/csr_test.go rename to util/cert/csr_test.go diff --git a/pkg/util/cert/io.go b/util/cert/io.go similarity index 100% rename from pkg/util/cert/io.go rename to util/cert/io.go diff --git a/pkg/util/cert/pem.go b/util/cert/pem.go similarity index 100% rename from pkg/util/cert/pem.go rename to util/cert/pem.go diff --git a/pkg/util/cert/testdata/dontUseThisKey.pem b/util/cert/testdata/dontUseThisKey.pem similarity index 100% rename from pkg/util/cert/testdata/dontUseThisKey.pem rename to util/cert/testdata/dontUseThisKey.pem diff --git a/pkg/util/cert/triple/triple.go b/util/cert/triple/triple.go similarity index 98% rename from pkg/util/cert/triple/triple.go rename to util/cert/triple/triple.go index 8719b82e..b89ef724 100644 --- a/pkg/util/cert/triple/triple.go +++ b/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/pkg/util/clock/clock.go b/util/clock/clock.go similarity index 100% rename from pkg/util/clock/clock.go rename to util/clock/clock.go diff --git a/pkg/util/clock/clock_test.go b/util/clock/clock_test.go similarity index 100% rename from pkg/util/clock/clock_test.go rename to util/clock/clock_test.go diff --git a/pkg/util/flowcontrol/backoff.go b/util/flowcontrol/backoff.go similarity index 98% rename from pkg/util/flowcontrol/backoff.go rename to util/flowcontrol/backoff.go index c3bf9582..030b15a5 100644 --- a/pkg/util/flowcontrol/backoff.go +++ b/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/pkg/util/flowcontrol/backoff_test.go b/util/flowcontrol/backoff_test.go similarity index 99% rename from pkg/util/flowcontrol/backoff_test.go rename to util/flowcontrol/backoff_test.go index 9cd9bb5c..5d1e4134 100644 --- a/pkg/util/flowcontrol/backoff_test.go +++ b/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/pkg/util/flowcontrol/throttle.go b/util/flowcontrol/throttle.go similarity index 100% rename from pkg/util/flowcontrol/throttle.go rename to util/flowcontrol/throttle.go diff --git a/pkg/util/flowcontrol/throttle_test.go b/util/flowcontrol/throttle_test.go similarity index 100% rename from pkg/util/flowcontrol/throttle_test.go rename to util/flowcontrol/throttle_test.go diff --git a/pkg/util/homedir/homedir.go b/util/homedir/homedir.go similarity index 100% rename from pkg/util/homedir/homedir.go rename to util/homedir/homedir.go diff --git a/pkg/util/integer/integer.go b/util/integer/integer.go similarity index 100% rename from pkg/util/integer/integer.go rename to util/integer/integer.go diff --git a/pkg/util/integer/integer_test.go b/util/integer/integer_test.go similarity index 100% rename from pkg/util/integer/integer_test.go rename to util/integer/integer_test.go diff --git a/pkg/util/jsonpath/doc.go b/util/jsonpath/doc.go similarity index 92% rename from pkg/util/jsonpath/doc.go rename to util/jsonpath/doc.go index bdbd056c..0effb15c 100644 --- a/pkg/util/jsonpath/doc.go +++ b/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/pkg/util/jsonpath/jsonpath.go b/util/jsonpath/jsonpath.go similarity index 100% rename from pkg/util/jsonpath/jsonpath.go rename to util/jsonpath/jsonpath.go diff --git a/pkg/util/jsonpath/jsonpath_test.go b/util/jsonpath/jsonpath_test.go similarity index 100% rename from pkg/util/jsonpath/jsonpath_test.go rename to util/jsonpath/jsonpath_test.go diff --git a/pkg/util/jsonpath/node.go b/util/jsonpath/node.go similarity index 100% rename from pkg/util/jsonpath/node.go rename to util/jsonpath/node.go diff --git a/pkg/util/jsonpath/parser.go b/util/jsonpath/parser.go similarity index 100% rename from pkg/util/jsonpath/parser.go rename to util/jsonpath/parser.go diff --git a/pkg/util/jsonpath/parser_test.go b/util/jsonpath/parser_test.go similarity index 100% rename from pkg/util/jsonpath/parser_test.go rename to util/jsonpath/parser_test.go diff --git a/pkg/util/testing/fake_handler.go b/util/testing/fake_handler.go similarity index 100% rename from pkg/util/testing/fake_handler.go rename to util/testing/fake_handler.go diff --git a/pkg/util/testing/fake_handler_test.go b/util/testing/fake_handler_test.go similarity index 100% rename from pkg/util/testing/fake_handler_test.go rename to util/testing/fake_handler_test.go diff --git a/pkg/util/testing/tmpdir.go b/util/testing/tmpdir.go similarity index 100% rename from pkg/util/testing/tmpdir.go rename to util/testing/tmpdir.go