diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 637cd347..884b82a9 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -390,6 +390,14 @@ "ImportPath": "k8s.io/apimachinery/pkg/types", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/apimachinery/pkg/util/cache", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "ImportPath": "k8s.io/apimachinery/pkg/util/clock", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" diff --git a/rest/BUILD b/rest/BUILD index 97e53ae6..1719e5c8 100644 --- a/rest/BUILD +++ b/rest/BUILD @@ -32,6 +32,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer/streaming:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", @@ -41,7 +42,6 @@ go_test( "//vendor/k8s.io/client-go/pkg/apis/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/rest/watch:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", "//vendor/k8s.io/client-go/util/testing:go_default_library", ], diff --git a/rest/request_test.go b/rest/request_test.go index b4a7e683..15bf851d 100755 --- a/rest/request_test.go +++ b/rest/request_test.go @@ -42,6 +42,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer/streaming" + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/intstr" @@ -49,7 +50,6 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/pkg/api/v1" 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" ) diff --git a/tools/cache/BUILD b/tools/cache/BUILD index 115cffc7..5bd08805 100644 --- a/tools/cache/BUILD +++ b/tools/cache/BUILD @@ -30,13 +30,13 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache/testing:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", ], ) @@ -72,6 +72,8 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/cache:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", @@ -79,6 +81,5 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", ], ) diff --git a/tools/cache/controller.go b/tools/cache/controller.go index e8c6a0e1..e8fe6706 100644 --- a/tools/cache/controller.go +++ b/tools/cache/controller.go @@ -21,9 +21,9 @@ import ( "time" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/clock" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/util/clock" ) // Config contains all the settings for a Controller. diff --git a/tools/cache/expiration_cache.go b/tools/cache/expiration_cache.go index befac1c7..fa88fc40 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/util/clock" + "k8s.io/apimachinery/pkg/util/clock" ) // ExpirationCache implements the store interface diff --git a/tools/cache/expiration_cache_fakes.go b/tools/cache/expiration_cache_fakes.go index ab2f5768..a096765f 100644 --- a/tools/cache/expiration_cache_fakes.go +++ b/tools/cache/expiration_cache_fakes.go @@ -17,8 +17,8 @@ limitations under the License. package cache import ( + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" - "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 17139d59..fac621cb 100644 --- a/tools/cache/expiration_cache_test.go +++ b/tools/cache/expiration_cache_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/util/clock" ) func TestTTLExpirationBasic(t *testing.T) { diff --git a/tools/cache/reflector.go b/tools/cache/reflector.go index b43f43a5..9a730610 100644 --- a/tools/cache/reflector.go +++ b/tools/cache/reflector.go @@ -38,10 +38,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/clock" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/util/clock" ) // Reflector watches a specified resource and causes all changes to be reflected in the given store. diff --git a/tools/cache/shared_informer.go b/tools/cache/shared_informer.go index 7c28dc58..a0dbbb69 100644 --- a/tools/cache/shared_informer.go +++ b/tools/cache/shared_informer.go @@ -22,9 +22,9 @@ import ( "time" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/clock" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/util/clock" "github.com/golang/glog" ) diff --git a/tools/cache/shared_informer_test.go b/tools/cache/shared_informer_test.go index 525223b4..216ba923 100644 --- a/tools/cache/shared_informer_test.go +++ b/tools/cache/shared_informer_test.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/pkg/api/v1" fcache "k8s.io/client-go/tools/cache/testing" - "k8s.io/client-go/util/clock" ) type testListener struct { diff --git a/tools/record/BUILD b/tools/record/BUILD index 5bca6489..b9f2fe10 100644 --- a/tools/record/BUILD +++ b/tools/record/BUILD @@ -20,13 +20,13 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library", "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1/ref:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", ], ) @@ -45,6 +45,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library", @@ -52,6 +53,5 @@ go_library( "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1/ref:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", ], ) diff --git a/tools/record/event.go b/tools/record/event.go index 999bd1cc..6b2fad40 100644 --- a/tools/record/event.go +++ b/tools/record/event.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/clock" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1/ref" 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 92599081..bc09f68f 100644 --- a/tools/record/event_test.go +++ b/tools/record/event_test.go @@ -28,12 +28,12 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sruntime "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1/ref" 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 f9a9ba9d..f5c0ca35 100644 --- a/tools/record/events_cache.go +++ b/tools/record/events_cache.go @@ -26,10 +26,10 @@ import ( "github.com/golang/groupcache/lru" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/util/clock" ) const ( diff --git a/tools/record/events_cache_test.go b/tools/record/events_cache_test.go index b6b52881..614b214e 100644 --- a/tools/record/events_cache_test.go +++ b/tools/record/events_cache_test.go @@ -23,9 +23,9 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/util/clock" ) func makeObjectReference(kind, name, namespace string) v1.ObjectReference { diff --git a/util/flowcontrol/BUILD b/util/flowcontrol/BUILD index 8509d7c2..8b8a3851 100644 --- a/util/flowcontrol/BUILD +++ b/util/flowcontrol/BUILD @@ -16,7 +16,7 @@ go_test( ], library = ":go_default_library", tags = ["automanaged"], - deps = ["//vendor/k8s.io/client-go/util/clock:go_default_library"], + deps = ["//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library"], ) go_library( @@ -28,7 +28,7 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/juju/ratelimit:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//vendor/k8s.io/client-go/util/integer:go_default_library", ], ) diff --git a/util/flowcontrol/backoff.go b/util/flowcontrol/backoff.go index 030b15a5..71d442a6 100644 --- a/util/flowcontrol/backoff.go +++ b/util/flowcontrol/backoff.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "k8s.io/client-go/util/clock" + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/client-go/util/integer" ) diff --git a/util/flowcontrol/backoff_test.go b/util/flowcontrol/backoff_test.go index 5d1e4134..23a6cbfa 100644 --- a/util/flowcontrol/backoff_test.go +++ b/util/flowcontrol/backoff_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/client-go/util/clock" + "k8s.io/apimachinery/pkg/util/clock" ) func TestSlowBackoff(t *testing.T) { diff --git a/util/workqueue/BUILD b/util/workqueue/BUILD index 9772567d..506bc888 100644 --- a/util/workqueue/BUILD +++ b/util/workqueue/BUILD @@ -18,8 +18,8 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", ], ) @@ -37,8 +37,8 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/juju/ratelimit:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", ], ) diff --git a/util/workqueue/delaying_queue.go b/util/workqueue/delaying_queue.go index 660c6572..74fefd38 100644 --- a/util/workqueue/delaying_queue.go +++ b/util/workqueue/delaying_queue.go @@ -20,8 +20,8 @@ import ( "container/heap" "time" + "k8s.io/apimachinery/pkg/util/clock" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "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/util/workqueue/delaying_queue_test.go b/util/workqueue/delaying_queue_test.go index 4c61939f..3c8ebf13 100644 --- a/util/workqueue/delaying_queue_test.go +++ b/util/workqueue/delaying_queue_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/util/clock" ) func TestSimpleQueue(t *testing.T) { diff --git a/util/workqueue/rate_limitting_queue_test.go b/util/workqueue/rate_limitting_queue_test.go index f6b2c0f8..32d7fc90 100644 --- a/util/workqueue/rate_limitting_queue_test.go +++ b/util/workqueue/rate_limitting_queue_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/client-go/util/clock" + "k8s.io/apimachinery/pkg/util/clock" ) func TestRateLimitingQueue(t *testing.T) {