Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c4771713
Commit
c4771713
authored
Jan 18, 2017
by
deads2k
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move utils used in restclient to client-go
parent
6c6616b4
Hide whitespace changes
Inline
Side-by-side
Showing
153 changed files
with
176 additions
and
1738 deletions
+176
-1738
BUILD
...aggregator/pkg/client/clientset_generated/clientset/BUILD
+1
-1
clientset.go
...tor/pkg/client/clientset_generated/clientset/clientset.go
+1
-1
BUILD
...or/pkg/client/clientset_generated/internalclientset/BUILD
+1
-1
clientset.go
...client/clientset_generated/internalclientset/clientset.go
+1
-1
generator_for_clientset.go
...s/go2idl/client-gen/generators/generator_for_clientset.go
+1
-1
BUILD
...stoutput/clientset_generated/test_internalclientset/BUILD
+2
-2
clientset.go
...t/clientset_generated/test_internalclientset/clientset.go
+1
-1
clientset_test.go
...entset_generated/test_internalclientset/clientset_test.go
+1
-1
BUILD
...ion/client/clientset_generated/federation_clientset/BUILD
+1
-1
clientset.go
...ent/clientset_generated/federation_clientset/clientset.go
+1
-1
BUILD
...nt/clientset_generated/federation_internalclientset/BUILD
+1
-1
clientset.go
...ntset_generated/federation_internalclientset/clientset.go
+1
-1
BUILD
federation/pkg/federation-controller/configmap/BUILD
+1
-1
configmap_controller.go
...g/federation-controller/configmap/configmap_controller.go
+1
-1
BUILD
federation/pkg/federation-controller/daemonset/BUILD
+1
-1
daemonset_controller.go
...g/federation-controller/daemonset/daemonset_controller.go
+1
-1
BUILD
federation/pkg/federation-controller/deployment/BUILD
+1
-1
deploymentcontroller.go
.../federation-controller/deployment/deploymentcontroller.go
+1
-1
BUILD
federation/pkg/federation-controller/ingress/BUILD
+1
-1
ingress_controller.go
...n/pkg/federation-controller/ingress/ingress_controller.go
+1
-1
BUILD
federation/pkg/federation-controller/namespace/BUILD
+1
-1
namespace_controller.go
...g/federation-controller/namespace/namespace_controller.go
+1
-1
BUILD
federation/pkg/federation-controller/replicaset/BUILD
+1
-1
replicasetcontroller.go
.../federation-controller/replicaset/replicasetcontroller.go
+1
-1
BUILD
federation/pkg/federation-controller/secret/BUILD
+1
-1
secret_controller.go
...ion/pkg/federation-controller/secret/secret_controller.go
+1
-1
BUILD
federation/pkg/federation-controller/util/BUILD
+1
-1
backoff.go
federation/pkg/federation-controller/util/backoff.go
+1
-1
BUILD
pkg/client/cache/BUILD
+2
-2
expiration_cache.go
pkg/client/cache/expiration_cache.go
+1
-1
expiration_cache_fakes.go
pkg/client/cache/expiration_cache_fakes.go
+1
-1
expiration_cache_test.go
pkg/client/cache/expiration_cache_test.go
+1
-1
BUILD
pkg/client/clientset_generated/clientset/BUILD
+1
-1
clientset.go
pkg/client/clientset_generated/clientset/clientset.go
+1
-1
BUILD
pkg/client/clientset_generated/internalclientset/BUILD
+1
-1
clientset.go
...client/clientset_generated/internalclientset/clientset.go
+1
-1
BUILD
pkg/client/record/BUILD
+2
-2
event.go
pkg/client/record/event.go
+1
-1
event_test.go
pkg/client/record/event_test.go
+1
-1
events_cache.go
pkg/client/record/events_cache.go
+1
-1
events_cache_test.go
pkg/client/record/events_cache_test.go
+1
-1
BUILD
pkg/client/restclient/BUILD
+3
-3
client.go
pkg/client/restclient/client.go
+1
-1
config.go
pkg/client/restclient/config.go
+1
-1
config_test.go
pkg/client/restclient/config_test.go
+1
-1
BUILD
pkg/client/restclient/fake/BUILD
+1
-1
fake.go
pkg/client/restclient/fake/fake.go
+1
-1
request.go
pkg/client/restclient/request.go
+1
-1
request_test.go
pkg/client/restclient/request_test.go
+2
-2
urlbackoff.go
pkg/client/restclient/urlbackoff.go
+1
-1
urlbackoff_test.go
pkg/client/restclient/urlbackoff_test.go
+1
-1
BUILD
pkg/client/typed/dynamic/BUILD
+1
-1
client.go
pkg/client/typed/dynamic/client.go
+1
-1
BUILD
pkg/cloudprovider/providers/gce/BUILD
+1
-1
gce.go
pkg/cloudprovider/providers/gce/gce.go
+1
-1
token_source.go
pkg/cloudprovider/providers/gce/token_source.go
+1
-1
BUILD
pkg/controller/BUILD
+3
-3
controller_utils.go
pkg/controller/controller_utils.go
+2
-2
controller_utils_test.go
pkg/controller/controller_utils_test.go
+1
-1
BUILD
pkg/controller/deployment/BUILD
+1
-1
rolling.go
pkg/controller/deployment/rolling.go
+1
-1
BUILD
pkg/controller/deployment/util/BUILD
+1
-1
deployment_util.go
pkg/controller/deployment/util/deployment_util.go
+1
-1
BUILD
pkg/controller/garbagecollector/BUILD
+2
-2
garbagecollector.go
pkg/controller/garbagecollector/garbagecollector.go
+1
-1
garbagecollector_test.go
pkg/controller/garbagecollector/garbagecollector_test.go
+1
-1
metrics.go
pkg/controller/garbagecollector/metrics.go
+1
-1
BUILD
pkg/controller/node/BUILD
+2
-2
nodecontroller.go
pkg/controller/node/nodecontroller.go
+1
-1
rate_limited_queue.go
pkg/controller/node/rate_limited_queue.go
+1
-1
rate_limited_queue_test.go
pkg/controller/node/rate_limited_queue_test.go
+1
-1
BUILD
pkg/controller/node/testutil/BUILD
+1
-1
test_utils.go
pkg/controller/node/testutil/test_utils.go
+1
-1
BUILD
pkg/kubectl/BUILD
+1
-1
rolling_updater.go
pkg/kubectl/rolling_updater.go
+1
-1
sorting_printer.go
pkg/kubectl/sorting_printer.go
+1
-1
BUILD
pkg/kubelet/BUILD
+5
-5
active_deadline.go
pkg/kubelet/active_deadline.go
+1
-1
active_deadline_test.go
pkg/kubelet/active_deadline_test.go
+1
-1
BUILD
pkg/kubelet/container/BUILD
+1
-1
runtime.go
pkg/kubelet/container/runtime.go
+1
-1
BUILD
pkg/kubelet/container/testing/BUILD
+1
-1
fake_runtime.go
pkg/kubelet/container/testing/fake_runtime.go
+1
-1
runtime_mock.go
pkg/kubelet/container/testing/runtime_mock.go
+1
-1
BUILD
pkg/kubelet/dockershim/BUILD
+1
-1
docker_service_test.go
pkg/kubelet/dockershim/docker_service_test.go
+1
-1
BUILD
pkg/kubelet/dockertools/BUILD
+4
-4
docker_manager.go
pkg/kubelet/dockertools/docker_manager.go
+1
-1
docker_manager_test.go
pkg/kubelet/dockertools/docker_manager_test.go
+2
-2
fake_docker_client.go
pkg/kubelet/dockertools/fake_docker_client.go
+1
-1
fake_manager.go
pkg/kubelet/dockertools/fake_manager.go
+1
-1
BUILD
pkg/kubelet/eviction/BUILD
+2
-2
eviction_manager.go
pkg/kubelet/eviction/eviction_manager.go
+1
-1
eviction_manager_test.go
pkg/kubelet/eviction/eviction_manager_test.go
+1
-1
BUILD
pkg/kubelet/images/BUILD
+3
-3
helpers.go
pkg/kubelet/images/helpers.go
+1
-1
image_gc_manager_test.go
pkg/kubelet/images/image_gc_manager_test.go
+1
-1
image_manager.go
pkg/kubelet/images/image_manager.go
+1
-1
image_manager_test.go
pkg/kubelet/images/image_manager_test.go
+2
-2
kubelet.go
pkg/kubelet/kubelet.go
+3
-3
kubelet_test.go
pkg/kubelet/kubelet_test.go
+2
-2
BUILD
pkg/kubelet/kuberuntime/BUILD
+2
-2
fake_kuberuntime_manager.go
pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go
+1
-1
kuberuntime_manager.go
pkg/kubelet/kuberuntime/kuberuntime_manager.go
+1
-1
kuberuntime_manager_test.go
pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
+1
-1
BUILD
pkg/kubelet/pleg/BUILD
+2
-2
generic.go
pkg/kubelet/pleg/generic.go
+1
-1
generic_test.go
pkg/kubelet/pleg/generic_test.go
+1
-1
pod_workers_test.go
pkg/kubelet/pod_workers_test.go
+1
-1
BUILD
pkg/kubelet/rkt/BUILD
+1
-1
rkt.go
pkg/kubelet/rkt/rkt.go
+1
-1
runonce_test.go
pkg/kubelet/runonce_test.go
+1
-1
BUILD
pkg/kubelet/server/streaming/BUILD
+1
-1
request_cache.go
pkg/kubelet/server/streaming/request_cache.go
+1
-1
BUILD
pkg/kubelet/util/cache/BUILD
+1
-1
object_cache_test.go
pkg/kubelet/util/cache/object_cache_test.go
+1
-1
BUILD
pkg/kubelet/util/queue/BUILD
+2
-2
work_queue.go
pkg/kubelet/util/queue/work_queue.go
+1
-1
work_queue_test.go
pkg/kubelet/util/queue/work_queue_test.go
+1
-1
BUILD
pkg/master/tunneler/BUILD
+2
-2
ssh.go
pkg/master/tunneler/ssh.go
+1
-1
ssh_test.go
pkg/master/tunneler/ssh_test.go
+1
-1
BUILD
pkg/proxy/iptables/BUILD
+1
-1
proxier.go
pkg/proxy/iptables/proxier.go
+1
-1
BUILD
pkg/storage/BUILD
+2
-2
watch_cache.go
pkg/storage/watch_cache.go
+1
-1
watch_cache_test.go
pkg/storage/watch_cache_test.go
+1
-1
BUILD
pkg/util/BUILD
+0
-3
BUILD
pkg/util/clock/BUILD
+0
-35
clock.go
pkg/util/clock/clock.go
+0
-218
clock_test.go
pkg/util/clock/clock_test.go
+0
-184
BUILD
pkg/util/flowcontrol/BUILD
+0
-47
backoff.go
pkg/util/flowcontrol/backoff.go
+0
-149
backoff_test.go
pkg/util/flowcontrol/backoff_test.go
+0
-195
throttle.go
pkg/util/flowcontrol/throttle.go
+0
-132
throttle_test.go
pkg/util/flowcontrol/throttle_test.go
+0
-177
BUILD
pkg/util/integer/BUILD
+0
-35
integer.go
pkg/util/integer/integer.go
+0
-67
integer_test.go
pkg/util/integer/integer_test.go
+0
-244
BUILD
pkg/util/metrics/BUILD
+1
-1
util.go
pkg/util/metrics/util.go
+1
-1
BUILD
pkg/util/workqueue/BUILD
+2
-2
delaying_queue.go
pkg/util/workqueue/delaying_queue.go
+1
-1
delaying_queue_test.go
pkg/util/workqueue/delaying_queue_test.go
+1
-1
rate_limitting_queue_test.go
pkg/util/workqueue/rate_limitting_queue_test.go
+1
-1
BUILD
plugin/pkg/admission/namespace/lifecycle/BUILD
+2
-2
admission.go
plugin/pkg/admission/namespace/lifecycle/admission.go
+1
-1
admission_test.go
plugin/pkg/admission/namespace/lifecycle/admission_test.go
+1
-1
copy.sh
staging/copy.sh
+3
-0
lruexpirecache_test.go
...rc/k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go
+1
-1
BUILD
test/e2e/BUILD
+1
-1
service_latency.go
test/e2e/service_latency.go
+1
-1
BUILD
vendor/BUILD
+1
-80
No files found.
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD
View file @
c4771713
...
...
@@ -18,9 +18,9 @@ go_library(
"//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/discovery:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//plugin/pkg/client/auth:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
],
)
...
...
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go
View file @
c4771713
...
...
@@ -18,10 +18,10 @@ package clientset
import
(
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
v1alpha1apiregistration
"k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1"
restclient
"k8s.io/kubernetes/pkg/client/restclient"
discovery
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/util/flowcontrol"
_
"k8s.io/kubernetes/plugin/pkg/client/auth"
)
...
...
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD
View file @
c4771713
...
...
@@ -18,9 +18,9 @@ go_library(
"//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/discovery:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//plugin/pkg/client/auth:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
],
)
...
...
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go
View file @
c4771713
...
...
@@ -18,10 +18,10 @@ package internalclientset
import
(
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
internalversionapiregistration
"k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion"
restclient
"k8s.io/kubernetes/pkg/client/restclient"
discovery
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/util/flowcontrol"
_
"k8s.io/kubernetes/plugin/pkg/client/auth"
)
...
...
cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go
View file @
c4771713
...
...
@@ -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/
kubernetes
/pkg/util/flowcontrol"
)
imports
=
append
(
imports
,
"k8s.io/
client-go
/pkg/util/flowcontrol"
)
// import solely to initialize client auth plugins.
imports
=
append
(
imports
,
"_
\"
k8s.io/kubernetes/plugin/pkg/client/auth
\"
"
)
return
...
...
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD
View file @
c4771713
...
...
@@ -19,9 +19,9 @@ go_library(
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/discovery:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//plugin/pkg/client/auth:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
],
)
...
...
@@ -32,7 +32,7 @@ go_test(
tags = ["automanaged"],
deps = [
"//pkg/client/restclient:go_default_library",
"//
pkg/util/flowcontrol:go_default_library
",
"//
vendor:k8s.io/client-go/pkg/util/flowcontrol
",
],
)
...
...
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go
View file @
c4771713
...
...
@@ -18,10 +18,10 @@ package test_internalclientset
import
(
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
internalversiontestgroup
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
restclient
"k8s.io/kubernetes/pkg/client/restclient"
discovery
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/util/flowcontrol"
_
"k8s.io/kubernetes/plugin/pkg/client/auth"
)
...
...
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go
View file @
c4771713
...
...
@@ -19,8 +19,8 @@ package test_internalclientset
import
(
"testing"
"k8s.io/client-go/pkg/util/flowcontrol"
restclient
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
func
ClientSetRateLimiterTest
(
t
*
testing
.
T
)
{
...
...
federation/client/clientset_generated/federation_clientset/BUILD
View file @
c4771713
...
...
@@ -23,9 +23,9 @@ go_library(
"//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/discovery:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//plugin/pkg/client/auth:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
],
)
...
...
federation/client/clientset_generated/federation_clientset/clientset.go
View file @
c4771713
...
...
@@ -18,13 +18,13 @@ package federation_clientset
import
(
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
v1batch
"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1"
v1core
"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1"
v1beta1extensions
"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1"
v1beta1federation
"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1"
restclient
"k8s.io/kubernetes/pkg/client/restclient"
discovery
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/util/flowcontrol"
_
"k8s.io/kubernetes/plugin/pkg/client/auth"
)
...
...
federation/client/clientset_generated/federation_internalclientset/BUILD
View file @
c4771713
...
...
@@ -23,9 +23,9 @@ go_library(
"//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/discovery:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//plugin/pkg/client/auth:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
],
)
...
...
federation/client/clientset_generated/federation_internalclientset/clientset.go
View file @
c4771713
...
...
@@ -18,13 +18,13 @@ package federation_internalclientset
import
(
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
internalversionbatch
"k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion"
internalversioncore
"k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion"
internalversionextensions
"k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion"
internalversionfederation
"k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion"
restclient
"k8s.io/kubernetes/pkg/client/restclient"
discovery
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/util/flowcontrol"
_
"k8s.io/kubernetes/plugin/pkg/client/auth"
)
...
...
federation/pkg/federation-controller/configmap/BUILD
View file @
c4771713
...
...
@@ -23,11 +23,11 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/record:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//vendor:github.com/golang/glog",
"//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",
],
)
...
...
federation/pkg/federation-controller/configmap/configmap_controller.go
View file @
c4771713
...
...
@@ -22,6 +22,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"
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"
...
...
@@ -32,7 +33,6 @@ import (
kubeclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"github.com/golang/glog"
)
...
...
federation/pkg/federation-controller/daemonset/BUILD
View file @
c4771713
...
...
@@ -25,12 +25,12 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/record:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//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",
],
)
...
...
federation/pkg/federation-controller/daemonset/daemonset_controller.go
View file @
c4771713
...
...
@@ -25,6 +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"
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"
...
...
@@ -37,7 +38,6 @@ import (
kubeclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"github.com/golang/glog"
)
...
...
federation/pkg/federation-controller/deployment/BUILD
View file @
c4771713
...
...
@@ -28,13 +28,13 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/record:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/workqueue:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//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",
],
)
...
...
federation/pkg/federation-controller/deployment/deploymentcontroller.go
View file @
c4771713
...
...
@@ -29,6 +29,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"
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"
...
...
@@ -44,7 +45,6 @@ import (
kubeclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/workqueue"
)
...
...
federation/pkg/federation-controller/ingress/BUILD
View file @
c4771713
...
...
@@ -25,7 +25,6 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/record:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
...
...
@@ -33,6 +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",
],
)
...
...
federation/pkg/federation-controller/ingress/ingress_controller.go
View file @
c4771713
...
...
@@ -27,6 +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"
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"
...
...
@@ -39,7 +40,6 @@ import (
kubeclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"github.com/golang/glog"
)
...
...
federation/pkg/federation-controller/namespace/BUILD
View file @
c4771713
...
...
@@ -24,11 +24,11 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/record:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/watch",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
],
)
...
...
federation/pkg/federation-controller/namespace/namespace_controller.go
View file @
c4771713
...
...
@@ -23,6 +23,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/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"
...
...
@@ -34,7 +35,6 @@ import (
kubeclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"github.com/golang/glog"
)
...
...
federation/pkg/federation-controller/replicaset/BUILD
View file @
c4771713
...
...
@@ -28,13 +28,13 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/record:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/workqueue:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//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",
],
)
...
...
federation/pkg/federation-controller/replicaset/replicasetcontroller.go
View file @
c4771713
...
...
@@ -29,6 +29,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"
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"
...
...
@@ -44,7 +45,6 @@ import (
kubeclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/workqueue"
)
...
...
federation/pkg/federation-controller/secret/BUILD
View file @
c4771713
...
...
@@ -24,12 +24,12 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/record:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//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",
],
)
...
...
federation/pkg/federation-controller/secret/secret_controller.go
View file @
c4771713
...
...
@@ -24,6 +24,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"
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"
...
...
@@ -35,7 +36,6 @@ import (
kubeclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"github.com/golang/glog"
)
...
...
federation/pkg/federation-controller/util/BUILD
View file @
c4771713
...
...
@@ -36,13 +36,13 @@ go_library(
"//pkg/client/restclient:go_default_library",
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/controller/deployment/util:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//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/tools/clientcmd/api",
],
)
...
...
federation/pkg/federation-controller/util/backoff.go
View file @
c4771713
...
...
@@ -19,7 +19,7 @@ package util
import
(
"time"
"k8s.io/
kubernetes
/pkg/util/flowcontrol"
"k8s.io/
client-go
/pkg/util/flowcontrol"
)
func
StartBackoffGC
(
backoff
*
flowcontrol
.
Backoff
,
stopCh
<-
chan
struct
{})
{
...
...
pkg/client/cache/BUILD
View file @
c4771713
...
...
@@ -45,7 +45,6 @@ go_library(
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/fields:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/api/meta",
...
...
@@ -58,6 +57,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",
],
)
...
...
@@ -88,7 +88,6 @@ go_test(
"//pkg/client/restclient:go_default_library",
"//pkg/client/testing/cache:go_default_library",
"//pkg/fields:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/testing:go_default_library",
"//vendor:github.com/google/gofuzz",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
...
...
@@ -98,6 +97,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",
],
)
...
...
pkg/client/cache/expiration_cache.go
View file @
c4771713
...
...
@@ -21,7 +21,7 @@ import (
"time"
"github.com/golang/glog"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
// ExpirationCache implements the store interface
...
...
pkg/client/cache/expiration_cache_fakes.go
View file @
c4771713
...
...
@@ -18,7 +18,7 @@ package cache
import
(
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
type
fakeThreadSafeMap
struct
{
...
...
pkg/client/cache/expiration_cache_test.go
View file @
c4771713
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
func
TestTTLExpirationBasic
(
t
*
testing
.
T
)
{
...
...
pkg/client/clientset_generated/clientset/BUILD
View file @
c4771713
...
...
@@ -43,9 +43,9 @@ go_library(
"//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/discovery:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//plugin/pkg/client/auth:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
],
)
...
...
pkg/client/clientset_generated/clientset/clientset.go
View file @
c4771713
...
...
@@ -18,6 +18,7 @@ package clientset
import
(
"github.com/golang/glog"
"k8s.io/client-go/pkg/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"
...
...
@@ -33,7 +34,6 @@ import (
v1beta1storage
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1"
restclient
"k8s.io/kubernetes/pkg/client/restclient"
discovery
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/util/flowcontrol"
_
"k8s.io/kubernetes/plugin/pkg/client/auth"
)
...
...
pkg/client/clientset_generated/internalclientset/BUILD
View file @
c4771713
...
...
@@ -42,9 +42,9 @@ go_library(
"//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/discovery:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//plugin/pkg/client/auth:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
],
)
...
...
pkg/client/clientset_generated/internalclientset/clientset.go
View file @
c4771713
...
...
@@ -18,6 +18,7 @@ package internalclientset
import
(
"github.com/golang/glog"
"k8s.io/client-go/pkg/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"
...
...
@@ -31,7 +32,6 @@ import (
internalversionstorage
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion"
restclient
"k8s.io/kubernetes/pkg/client/restclient"
discovery
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/util/flowcontrol"
_
"k8s.io/kubernetes/plugin/pkg/client/auth"
)
...
...
pkg/client/record/BUILD
View file @
c4771713
...
...
@@ -20,7 +20,6 @@ go_library(
deps = [
"//pkg/api/v1:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/strategicpatch:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/golang/groupcache/lru",
...
...
@@ -30,6 +29,7 @@ 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",
],
)
...
...
@@ -45,12 +45,12 @@ go_test(
"//pkg/api/install:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/strategicpatch:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//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",
],
)
...
...
pkg/client/record/event.go
View file @
c4771713
...
...
@@ -26,9 +26,9 @@ 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"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/util/clock"
"net/http"
...
...
pkg/client/record/event_test.go
View file @
c4771713
...
...
@@ -28,10 +28,10 @@ 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"
_
"k8s.io/kubernetes/pkg/api/install"
// To register api.Pod used in tests below
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/strategicpatch"
)
...
...
pkg/client/record/events_cache.go
View file @
c4771713
...
...
@@ -27,8 +27,8 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/strategicpatch"
)
...
...
pkg/client/record/events_cache_test.go
View file @
c4771713
...
...
@@ -24,8 +24,8 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/clock"
)
func
makeObjectReference
(
kind
,
name
,
namespace
string
)
v1
.
ObjectReference
{
...
...
pkg/client/restclient/BUILD
View file @
c4771713
...
...
@@ -28,7 +28,6 @@ go_library(
"//pkg/client/metrics:go_default_library",
"//pkg/fields:go_default_library",
"//pkg/util/cert:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/version:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
...
...
@@ -41,6 +40,7 @@ go_library(
"//vendor:k8s.io/apimachinery/pkg/util/net",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apimachinery/pkg/watch",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
"//vendor:k8s.io/client-go/rest/watch",
"//vendor:k8s.io/client-go/tools/clientcmd/api",
"//vendor:k8s.io/client-go/transport",
...
...
@@ -63,8 +63,6 @@ go_test(
"//pkg/api:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/httpstream:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/util/testing:go_default_library",
...
...
@@ -78,6 +76,8 @@ go_test(
"//vendor:k8s.io/apimachinery/pkg/types",
"//vendor:k8s.io/apimachinery/pkg/util/diff",
"//vendor:k8s.io/apimachinery/pkg/watch",
"//vendor:k8s.io/client-go/pkg/util/clock",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
"//vendor:k8s.io/client-go/rest/watch",
"//vendor:k8s.io/client-go/tools/clientcmd/api",
],
...
...
pkg/client/restclient/client.go
View file @
c4771713
...
...
@@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/
kubernetes
/pkg/util/flowcontrol"
"k8s.io/
client-go
/pkg/util/flowcontrol"
)
const
(
...
...
pkg/client/restclient/config.go
View file @
c4771713
...
...
@@ -32,10 +32,10 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/util/flowcontrol"
clientcmdapi
"k8s.io/client-go/tools/clientcmd/api"
"k8s.io/kubernetes/pkg/api"
certutil
"k8s.io/kubernetes/pkg/util/cert"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/version"
)
...
...
pkg/client/restclient/config_test.go
View file @
c4771713
...
...
@@ -28,10 +28,10 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/client-go/pkg/util/flowcontrol"
clientcmdapi
"k8s.io/client-go/tools/clientcmd/api"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
func
TestIsConfigTransportTLS
(
t
*
testing
.
T
)
{
...
...
pkg/client/restclient/fake/BUILD
View file @
c4771713
...
...
@@ -15,10 +15,10 @@ go_library(
"//pkg/api:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/util/flowcontrol:go_default_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",
],
)
...
...
pkg/client/restclient/fake/fake.go
View file @
c4771713
...
...
@@ -25,10 +25,10 @@ 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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
func
CreateHTTPClient
(
roundTripper
func
(
*
http
.
Request
)
(
*
http
.
Response
,
error
))
*
http
.
Client
{
...
...
pkg/client/restclient/request.go
View file @
c4771713
...
...
@@ -42,12 +42,12 @@ import (
"k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/util/flowcontrol"
restclientwatch
"k8s.io/client-go/rest/watch"
"k8s.io/kubernetes/pkg/api/v1"
pathvalidation
"k8s.io/kubernetes/pkg/api/validation/path"
"k8s.io/kubernetes/pkg/client/metrics"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
var
(
...
...
pkg/client/restclient/request_test.go
View file @
c4771713
...
...
@@ -42,12 +42,12 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/client-go/pkg/util/flowcontrol"
restclientwatch
"k8s.io/client-go/rest/watch"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/httpstream"
"k8s.io/kubernetes/pkg/util/intstr"
utiltesting
"k8s.io/kubernetes/pkg/util/testing"
...
...
pkg/client/restclient/urlbackoff.go
View file @
c4771713
...
...
@@ -22,7 +22,7 @@ import (
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/
kubernetes
/pkg/util/flowcontrol"
"k8s.io/
client-go
/pkg/util/flowcontrol"
)
// Set of resp. Codes that we backoff for.
...
...
pkg/client/restclient/urlbackoff_test.go
View file @
c4771713
...
...
@@ -21,7 +21,7 @@ import (
"testing"
"time"
"k8s.io/
kubernetes
/pkg/util/flowcontrol"
"k8s.io/
client-go
/pkg/util/flowcontrol"
)
func
parse
(
raw
string
)
*
url
.
URL
{
...
...
pkg/client/typed/dynamic/BUILD
View file @
c4771713
...
...
@@ -20,7 +20,6 @@ go_library(
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/meta",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
...
...
@@ -30,6 +29,7 @@ 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",
],
)
...
...
pkg/client/typed/dynamic/client.go
View file @
c4771713
...
...
@@ -34,10 +34,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
// Client is a Kubernetes client that allows you to access metadata
...
...
pkg/cloudprovider/providers/gce/BUILD
View file @
c4771713
...
...
@@ -20,7 +20,6 @@ go_library(
"//pkg/api/v1:go_default_library",
"//pkg/api/v1/service:go_default_library",
"//pkg/cloudprovider:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/net/sets:go_default_library",
"//pkg/volume:go_default_library",
"//vendor:cloud.google.com/go/compute/metadata",
...
...
@@ -37,6 +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",
],
)
...
...
pkg/cloudprovider/providers/gce/gce.go
View file @
c4771713
...
...
@@ -35,10 +35,10 @@ 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/kubernetes/pkg/api/v1"
apiservice
"k8s.io/kubernetes/pkg/api/v1/service"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/util/flowcontrol"
netsets
"k8s.io/kubernetes/pkg/util/net/sets"
"k8s.io/kubernetes/pkg/volume"
...
...
pkg/cloudprovider/providers/gce/token_source.go
View file @
c4771713
...
...
@@ -22,7 +22,7 @@ import (
"strings"
"time"
"k8s.io/
kubernetes
/pkg/util/flowcontrol"
"k8s.io/
client-go
/pkg/util/flowcontrol"
"github.com/prometheus/client_golang/prometheus"
"golang.org/x/oauth2"
...
...
pkg/controller/BUILD
View file @
c4771713
...
...
@@ -30,9 +30,7 @@ go_library(
"//pkg/client/restclient:go_default_library",
"//pkg/fields:go_default_library",
"//pkg/serviceaccount:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/hash:go_default_library",
"//pkg/util/integer:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/golang/groupcache/lru",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
...
...
@@ -45,6 +43,8 @@ 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",
],
)
...
...
@@ -62,12 +62,12 @@ go_test(
"//pkg/client/record:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/securitycontext:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/testing:go_default_library",
"//pkg/util/uuid:go_default_library",
"//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",
],
)
...
...
pkg/controller/controller_utils.go
View file @
c4771713
...
...
@@ -30,6 +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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/validation"
...
...
@@ -37,8 +39,6 @@ import (
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/integer"
)
const
(
...
...
pkg/controller/controller_utils_test.go
View file @
c4771713
...
...
@@ -30,6 +30,7 @@ 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"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
...
...
@@ -38,7 +39,6 @@ import (
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/securitycontext"
"k8s.io/kubernetes/pkg/util/clock"
utiltesting
"k8s.io/kubernetes/pkg/util/testing"
"k8s.io/kubernetes/pkg/util/uuid"
)
...
...
pkg/controller/deployment/BUILD
View file @
c4771713
...
...
@@ -30,7 +30,6 @@ go_library(
"//pkg/controller:go_default_library",
"//pkg/controller/deployment/util:go_default_library",
"//pkg/controller/informers:go_default_library",
"//pkg/util/integer:go_default_library",
"//pkg/util/labels:go_default_library",
"//pkg/util/metrics:go_default_library",
"//pkg/util/workqueue:go_default_library",
...
...
@@ -42,6 +41,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",
],
)
...
...
pkg/controller/deployment/rolling.go
View file @
c4771713
...
...
@@ -21,10 +21,10 @@ import (
"sort"
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/integer"
extensions
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/controller"
deploymentutil
"k8s.io/kubernetes/pkg/controller/deployment/util"
"k8s.io/kubernetes/pkg/util/integer"
)
// rolloutRolling implements the logic for rolling a new replica set.
...
...
pkg/controller/deployment/util/BUILD
View file @
c4771713
...
...
@@ -29,7 +29,6 @@ go_library(
"//pkg/client/retry:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/hash:go_default_library",
"//pkg/util/integer:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/util/labels:go_default_library",
"//vendor:github.com/golang/glog",
...
...
@@ -39,6 +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",
],
)
...
...
pkg/controller/deployment/util/deployment_util.go
View file @
c4771713
...
...
@@ -31,6 +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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/annotations"
"k8s.io/kubernetes/pkg/api/v1"
...
...
@@ -39,7 +40,6 @@ import (
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/integer"
intstrutil
"k8s.io/kubernetes/pkg/util/intstr"
labelsutil
"k8s.io/kubernetes/pkg/util/labels"
)
...
...
pkg/controller/garbagecollector/BUILD
View file @
c4771713
...
...
@@ -22,7 +22,6 @@ go_library(
"//pkg/client/cache:go_default_library",
"//pkg/client/typed/dynamic:go_default_library",
"//pkg/controller/garbagecollector/metaonly:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/metrics:go_default_library",
"//pkg/util/workqueue:go_default_library",
"//vendor:github.com/golang/glog",
...
...
@@ -40,6 +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",
],
)
...
...
@@ -55,7 +55,6 @@ go_test(
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/dynamic:go_default_library",
"//pkg/controller/garbagecollector/metaonly:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/workqueue:go_default_library",
"//vendor:github.com/stretchr/testify/assert",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
...
...
@@ -64,6 +63,7 @@ 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",
],
)
...
...
pkg/controller/garbagecollector/garbagecollector.go
View file @
c4771713
...
...
@@ -35,11 +35,11 @@ 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/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/typed/dynamic"
"k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/workqueue"
)
...
...
pkg/controller/garbagecollector/garbagecollector_test.go
View file @
c4771713
...
...
@@ -33,12 +33,12 @@ 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"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/typed/dynamic"
"k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/workqueue"
)
...
...
pkg/controller/garbagecollector/metrics.go
View file @
c4771713
...
...
@@ -20,7 +20,7 @@ import (
"sync"
"time"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
"github.com/prometheus/client_golang/prometheus"
)
...
...
pkg/controller/node/BUILD
View file @
c4771713
...
...
@@ -31,7 +31,6 @@ go_library(
"//pkg/controller/informers:go_default_library",
"//pkg/fields:go_default_library",
"//pkg/kubelet/util/format:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/metrics:go_default_library",
"//pkg/util/node:go_default_library",
"//pkg/util/system:go_default_library",
...
...
@@ -46,6 +45,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",
],
)
...
...
@@ -73,7 +73,6 @@ go_test(
"//pkg/controller:go_default_library",
"//pkg/controller/informers:go_default_library",
"//pkg/controller/node/testutil:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/node:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
...
...
@@ -81,6 +80,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",
],
)
...
...
pkg/controller/node/nodecontroller.go
View file @
c4771713
...
...
@@ -29,6 +29,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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/cache"
...
...
@@ -38,7 +39,6 @@ import (
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/controller/informers"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/metrics"
utilnode
"k8s.io/kubernetes/pkg/util/node"
"k8s.io/kubernetes/pkg/util/system"
...
...
pkg/controller/node/rate_limited_queue.go
View file @
c4771713
...
...
@@ -22,7 +22,7 @@ import (
"time"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/
kubernetes
/pkg/util/flowcontrol"
"k8s.io/
client-go
/pkg/util/flowcontrol"
"github.com/golang/glog"
)
...
...
pkg/controller/node/rate_limited_queue_test.go
View file @
c4771713
...
...
@@ -22,7 +22,7 @@ import (
"time"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/
kubernetes
/pkg/util/flowcontrol"
"k8s.io/
client-go
/pkg/util/flowcontrol"
)
func
CheckQueueEq
(
lhs
[]
string
,
rhs
TimedQueue
)
bool
{
...
...
pkg/controller/node/testutil/BUILD
View file @
c4771713
...
...
@@ -17,7 +17,6 @@ go_library(
"//pkg/api/v1:go_default_library",
"//pkg/client/clientset_generated/clientset/fake:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/node:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
...
...
@@ -25,6 +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",
],
)
...
...
pkg/controller/node/testutil/test_utils.go
View file @
c4771713
...
...
@@ -28,12 +28,12 @@ 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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
v1core
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
"k8s.io/kubernetes/pkg/util/clock"
utilnode
"k8s.io/kubernetes/pkg/util/node"
)
...
...
pkg/kubectl/BUILD
View file @
c4771713
...
...
@@ -88,7 +88,6 @@ go_library(
"//pkg/kubectl/resource:go_default_library",
"//pkg/kubelet/qos:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/integer:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/util/jsonpath:go_default_library",
"//pkg/util/node:go_default_library",
...
...
@@ -112,6 +111,7 @@ 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",
],
)
...
...
pkg/kubectl/rolling_updater.go
View file @
c4771713
...
...
@@ -29,13 +29,13 @@ 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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
coreclient
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
"k8s.io/kubernetes/pkg/client/retry"
client
"k8s.io/kubernetes/pkg/client/unversioned"
deploymentutil
"k8s.io/kubernetes/pkg/controller/deployment/util"
"k8s.io/kubernetes/pkg/util/integer"
"k8s.io/kubernetes/pkg/util/intstr"
)
...
...
pkg/kubectl/sorting_printer.go
View file @
c4771713
...
...
@@ -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/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/integer"
"k8s.io/kubernetes/pkg/util/jsonpath"
)
...
...
pkg/kubelet/BUILD
View file @
c4771713
...
...
@@ -87,12 +87,9 @@ go_library(
"//pkg/securitycontext:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/bandwidth:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/config:go_default_library",
"//pkg/util/dbus:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/integer:go_default_library",
"//pkg/util/io:go_default_library",
"//pkg/util/iptables:go_default_library",
"//pkg/util/mount:go_default_library",
...
...
@@ -125,6 +122,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",
],
)
...
...
@@ -181,8 +181,6 @@ go_test(
"//pkg/kubelet/util/sliceutils:go_default_library",
"//pkg/kubelet/volumemanager:go_default_library",
"//pkg/util/bandwidth:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/mount:go_default_library",
"//pkg/util/strategicpatch:go_default_library",
"//pkg/util/testing:go_default_library",
...
...
@@ -206,6 +204,8 @@ 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",
],
)
...
...
pkg/kubelet/active_deadline.go
View file @
c4771713
...
...
@@ -20,11 +20,11 @@ import (
"fmt"
"time"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
"k8s.io/kubernetes/pkg/kubelet/status"
"k8s.io/kubernetes/pkg/util/clock"
)
const
(
...
...
pkg/kubelet/active_deadline_test.go
View file @
c4771713
...
...
@@ -22,9 +22,9 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/util/clock"
)
// mockPodStatusProvider returns the status on the specified pod
...
...
pkg/kubelet/container/BUILD
View file @
c4771713
...
...
@@ -31,7 +31,6 @@ go_library(
"//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/util/format:go_default_library",
"//pkg/kubelet/util/ioutils:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/hash:go_default_library",
"//pkg/util/term:go_default_library",
"//pkg/volume:go_default_library",
...
...
@@ -43,6 +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",
],
)
...
...
pkg/kubelet/container/runtime.go
View file @
c4771713
...
...
@@ -26,9 +26,9 @@ import (
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/api/v1"
runtimeapi
"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/term"
"k8s.io/kubernetes/pkg/volume"
)
...
...
pkg/kubelet/container/testing/BUILD
View file @
c4771713
...
...
@@ -20,12 +20,12 @@ go_library(
deps = [
"//pkg/api/v1:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/term:go_default_library",
"//pkg/volume:go_default_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",
],
)
...
...
pkg/kubelet/container/testing/fake_runtime.go
View file @
c4771713
...
...
@@ -25,9 +25,9 @@ import (
"time"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/api/v1"
.
"k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/term"
"k8s.io/kubernetes/pkg/volume"
)
...
...
pkg/kubelet/container/testing/runtime_mock.go
View file @
c4771713
...
...
@@ -22,9 +22,9 @@ import (
"github.com/stretchr/testify/mock"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/api/v1"
.
"k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/term"
"k8s.io/kubernetes/pkg/volume"
)
...
...
pkg/kubelet/dockershim/BUILD
View file @
c4771713
...
...
@@ -78,12 +78,12 @@ go_test(
"//pkg/kubelet/types:go_default_library",
"//pkg/security/apparmor:go_default_library",
"//pkg/securitycontext:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:github.com/docker/engine-api/types",
"//vendor:github.com/docker/engine-api/types/container",
"//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",
],
)
...
...
pkg/kubelet/dockershim/docker_service_test.go
View file @
c4771713
...
...
@@ -24,12 +24,12 @@ import (
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"k8s.io/client-go/pkg/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"
"k8s.io/kubernetes/pkg/kubelet/network"
"k8s.io/kubernetes/pkg/kubelet/network/mock_network"
"k8s.io/kubernetes/pkg/util/clock"
)
// newTestNetworkPlugin returns a mock plugin that implements network.NetworkPlugin
...
...
pkg/kubelet/dockertools/BUILD
View file @
c4771713
...
...
@@ -47,9 +47,7 @@ go_library(
"//pkg/kubelet/util/format:go_default_library",
"//pkg/security/apparmor:go_default_library",
"//pkg/securitycontext:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/oom:go_default_library",
"//pkg/util/procfs:go_default_library",
"//pkg/util/selinux:go_default_library",
...
...
@@ -76,6 +74,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",
],
)
...
...
@@ -116,9 +116,7 @@ go_test(
"//pkg/kubelet/types:go_default_library",
"//pkg/kubelet/util/format:go_default_library",
"//pkg/security/apparmor:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/hash:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/util/strings:go_default_library",
...
...
@@ -134,6 +132,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",
],
)
...
...
pkg/kubelet/dockertools/docker_manager.go
View file @
c4771713
...
...
@@ -47,6 +47,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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
...
...
@@ -65,7 +66,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/util/format"
"k8s.io/kubernetes/pkg/security/apparmor"
"k8s.io/kubernetes/pkg/securitycontext"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/oom"
"k8s.io/kubernetes/pkg/util/procfs"
"k8s.io/kubernetes/pkg/util/selinux"
...
...
pkg/kubelet/dockertools/docker_manager_test.go
View file @
c4771713
...
...
@@ -40,6 +40,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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
...
...
@@ -53,9 +55,7 @@ import (
nettest
"k8s.io/kubernetes/pkg/kubelet/network/testing"
proberesults
"k8s.io/kubernetes/pkg/kubelet/prober/results"
"k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/util/clock"
uexec
"k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/intstr"
)
...
...
pkg/kubelet/dockertools/fake_docker_client.go
View file @
c4771713
...
...
@@ -28,7 +28,7 @@ import (
dockertypes
"github.com/docker/engine-api/types"
dockercontainer
"github.com/docker/engine-api/types/container"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
"k8s.io/kubernetes/pkg/api/v1"
)
...
...
pkg/kubelet/dockertools/fake_manager.go
View file @
c4771713
...
...
@@ -19,6 +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/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
kubecontainer
"k8s.io/kubernetes/pkg/kubelet/container"
...
...
@@ -26,7 +27,6 @@ import (
proberesults
"k8s.io/kubernetes/pkg/kubelet/prober/results"
kubetypes
"k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/kubelet/util/cache"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/oom"
"k8s.io/kubernetes/pkg/util/procfs"
)
...
...
pkg/kubelet/eviction/BUILD
View file @
c4771713
...
...
@@ -33,11 +33,11 @@ go_library(
"//pkg/kubelet/types:go_default_library",
"//pkg/kubelet/util/format:go_default_library",
"//pkg/quota/evaluator/core:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:github.com/golang/glog",
"//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",
],
)
...
...
@@ -58,9 +58,9 @@ go_test(
"//pkg/kubelet/lifecycle:go_default_library",
"//pkg/kubelet/types:go_default_library",
"//pkg/quota:go_default_library",
"//pkg/util/clock: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",
],
)
...
...
pkg/kubelet/eviction/eviction_manager.go
View file @
c4771713
...
...
@@ -24,6 +24,7 @@ import (
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
...
...
@@ -34,7 +35,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/server/stats"
kubetypes
"k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/kubelet/util/format"
"k8s.io/kubernetes/pkg/util/clock"
)
// managerImpl implements Manager
...
...
pkg/kubelet/eviction/eviction_manager_test.go
View file @
c4771713
...
...
@@ -21,13 +21,13 @@ import (
"time"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
statsapi
"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
kubetypes
"k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/util/clock"
)
// mockPodKiller is used to testing which pod is killed
...
...
pkg/kubelet/images/BUILD
View file @
c4771713
...
...
@@ -25,13 +25,13 @@ go_library(
"//pkg/kubelet/cadvisor:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/events:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/parsers:go_default_library",
"//vendor:github.com/docker/distribution/reference",
"//vendor:github.com/golang/glog",
"//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",
],
)
...
...
@@ -49,12 +49,12 @@ go_test(
"//pkg/kubelet/cadvisor/testing:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/container/testing:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//vendor:github.com/google/cadvisor/info/v2",
"//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",
],
)
...
...
pkg/kubelet/images/helpers.go
View file @
c4771713
...
...
@@ -19,9 +19,9 @@ package images
import
(
"fmt"
"k8s.io/client-go/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/api/v1"
kubecontainer
"k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
// throttleImagePulling wraps kubecontainer.ImageService to throttle image
...
...
pkg/kubelet/images/image_gc_manager_test.go
View file @
c4771713
...
...
@@ -24,11 +24,11 @@ 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/kubernetes/pkg/client/record"
cadvisortest
"k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
"k8s.io/kubernetes/pkg/kubelet/container"
containertest
"k8s.io/kubernetes/pkg/kubelet/container/testing"
"k8s.io/kubernetes/pkg/util/clock"
)
var
zero
time
.
Time
...
...
pkg/kubelet/images/image_manager.go
View file @
c4771713
...
...
@@ -21,11 +21,11 @@ import (
dockerref
"github.com/docker/distribution/reference"
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
kubecontainer
"k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/parsers"
)
...
...
pkg/kubelet/images/image_manager_test.go
View file @
c4771713
...
...
@@ -23,12 +23,12 @@ 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/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
.
"k8s.io/kubernetes/pkg/kubelet/container"
ctest
"k8s.io/kubernetes/pkg/kubelet/container/testing"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
type
pullerTestCase
struct
{
...
...
pkg/kubelet/kubelet.go
View file @
c4771713
...
...
@@ -39,6 +39,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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
...
...
@@ -82,12 +85,9 @@ import (
"k8s.io/kubernetes/pkg/kubelet/volumemanager"
"k8s.io/kubernetes/pkg/security/apparmor"
"k8s.io/kubernetes/pkg/util/bandwidth"
"k8s.io/kubernetes/pkg/util/clock"
utilconfig
"k8s.io/kubernetes/pkg/util/config"
utildbus
"k8s.io/kubernetes/pkg/util/dbus"
utilexec
"k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/integer"
kubeio
"k8s.io/kubernetes/pkg/util/io"
utilipt
"k8s.io/kubernetes/pkg/util/iptables"
"k8s.io/kubernetes/pkg/util/mount"
...
...
pkg/kubelet/kubelet_test.go
View file @
c4771713
...
...
@@ -33,6 +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/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
...
...
@@ -59,8 +61,6 @@ import (
kubetypes
"k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/kubelet/util/queue"
kubeletvolume
"k8s.io/kubernetes/pkg/kubelet/volumemanager"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
_
"k8s.io/kubernetes/pkg/volume/host_path"
...
...
pkg/kubelet/kuberuntime/BUILD
View file @
c4771713
...
...
@@ -45,7 +45,6 @@ go_library(
"//pkg/kubelet/util/cache:go_default_library",
"//pkg/kubelet/util/format:go_default_library",
"//pkg/securitycontext:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/parsers:go_default_library",
"//pkg/util/selinux:go_default_library",
"//pkg/util/version:go_default_library",
...
...
@@ -58,6 +57,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",
],
)
...
...
@@ -84,7 +84,6 @@ go_test(
"//pkg/kubelet/container/testing:go_default_library",
"//pkg/kubelet/network:go_default_library",
"//pkg/kubelet/network/testing:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/intstr:go_default_library",
"//vendor:github.com/golang/mock/gomock",
"//vendor:github.com/google/cadvisor/info/v1",
...
...
@@ -92,6 +91,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",
],
)
...
...
pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go
View file @
c4771713
...
...
@@ -24,6 +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/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/credentialprovider"
...
...
@@ -33,7 +34,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
"k8s.io/kubernetes/pkg/kubelet/network"
proberesults
"k8s.io/kubernetes/pkg/kubelet/prober/results"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
type
fakeHTTP
struct
{
...
...
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View file @
c4771713
...
...
@@ -28,6 +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/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/credentialprovider"
...
...
@@ -42,7 +43,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/kubelet/util/cache"
"k8s.io/kubernetes/pkg/kubelet/util/format"
"k8s.io/kubernetes/pkg/util/flowcontrol"
utilversion
"k8s.io/kubernetes/pkg/util/version"
)
...
...
pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
View file @
c4771713
...
...
@@ -27,6 +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/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
apitest
"k8s.io/kubernetes/pkg/kubelet/api/testing"
...
...
@@ -35,7 +36,6 @@ import (
containertest
"k8s.io/kubernetes/pkg/kubelet/container/testing"
"k8s.io/kubernetes/pkg/kubelet/network"
nettest
"k8s.io/kubernetes/pkg/kubelet/network/testing"
"k8s.io/kubernetes/pkg/util/flowcontrol"
)
var
(
...
...
pkg/kubelet/pleg/BUILD
View file @
c4771713
...
...
@@ -19,11 +19,11 @@ go_library(
deps = [
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/metrics:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:github.com/golang/glog",
"//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",
],
)
...
...
@@ -35,10 +35,10 @@ go_test(
deps = [
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/container/testing:go_default_library",
"//pkg/util/clock:go_default_library",
"//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",
],
)
...
...
pkg/kubelet/pleg/generic.go
View file @
c4771713
...
...
@@ -25,9 +25,9 @@ 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"
kubecontainer
"k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/metrics"
"k8s.io/kubernetes/pkg/util/clock"
)
// GenericPLEG is an extremely simple generic PLEG that relies solely on
...
...
pkg/kubelet/pleg/generic_test.go
View file @
c4771713
...
...
@@ -27,9 +27,9 @@ import (
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/client-go/pkg/util/clock"
kubecontainer
"k8s.io/kubernetes/pkg/kubelet/container"
containertest
"k8s.io/kubernetes/pkg/kubelet/container/testing"
"k8s.io/kubernetes/pkg/util/clock"
)
const
(
...
...
pkg/kubelet/pod_workers_test.go
View file @
c4771713
...
...
@@ -24,13 +24,13 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
kubecontainer
"k8s.io/kubernetes/pkg/kubelet/container"
containertest
"k8s.io/kubernetes/pkg/kubelet/container/testing"
kubetypes
"k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/kubelet/util/queue"
"k8s.io/kubernetes/pkg/util/clock"
)
// fakePodWorkers runs sync pod function in serial, so we can have
...
...
pkg/kubelet/rkt/BUILD
View file @
c4771713
...
...
@@ -38,7 +38,6 @@ go_library(
"//pkg/kubelet/util/format:go_default_library",
"//pkg/securitycontext:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/parsers:go_default_library",
"//pkg/util/selinux:go_default_library",
"//pkg/util/strings:go_default_library",
...
...
@@ -58,6 +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",
],
)
...
...
pkg/kubelet/rkt/rkt.go
View file @
c4771713
...
...
@@ -45,6 +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/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/credentialprovider"
...
...
@@ -60,7 +61,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/util/format"
"k8s.io/kubernetes/pkg/securitycontext"
utilexec
"k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/selinux"
utilstrings
"k8s.io/kubernetes/pkg/util/strings"
"k8s.io/kubernetes/pkg/util/term"
...
...
pkg/kubelet/runonce_test.go
View file @
c4771713
...
...
@@ -25,6 +25,7 @@ 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"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
...
...
@@ -41,7 +42,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/server/stats"
"k8s.io/kubernetes/pkg/kubelet/status"
"k8s.io/kubernetes/pkg/kubelet/volumemanager"
"k8s.io/kubernetes/pkg/util/clock"
utiltesting
"k8s.io/kubernetes/pkg/util/testing"
"k8s.io/kubernetes/pkg/volume"
volumetest
"k8s.io/kubernetes/pkg/volume/testing"
...
...
pkg/kubelet/server/streaming/BUILD
View file @
c4771713
...
...
@@ -20,12 +20,12 @@ go_library(
"//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/server/portforward:go_default_library",
"//pkg/kubelet/server/remotecommand:go_default_library",
"//pkg/util/clock:go_default_library",
"//pkg/util/term:go_default_library",
"//vendor:github.com/emicklei/go-restful",
"//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",
],
)
...
...
pkg/kubelet/server/streaming/request_cache.go
View file @
c4771713
...
...
@@ -25,7 +25,7 @@ import (
"sync"
"time"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
var
(
...
...
pkg/kubelet/util/cache/BUILD
View file @
c4771713
...
...
@@ -22,7 +22,7 @@ go_test(
tags = ["automanaged"],
deps = [
"//pkg/client/cache:go_default_library",
"//
pkg/util/clock:go_default_library
",
"//
vendor:k8s.io/client-go/pkg/util/clock
",
],
)
...
...
pkg/kubelet/util/cache/object_cache_test.go
View file @
c4771713
...
...
@@ -21,8 +21,8 @@ import (
"testing"
"time"
"k8s.io/client-go/pkg/util/clock"
expirationcache
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/util/clock"
)
type
testObject
struct
{
...
...
pkg/kubelet/util/queue/BUILD
View file @
c4771713
...
...
@@ -13,8 +13,8 @@ go_library(
srcs = ["work_queue.go"],
tags = ["automanaged"],
deps = [
"//pkg/util/clock:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/types",
"//vendor:k8s.io/client-go/pkg/util/clock",
],
)
...
...
@@ -24,9 +24,9 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/util/clock:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/types",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/client-go/pkg/util/clock",
],
)
...
...
pkg/kubelet/util/queue/work_queue.go
View file @
c4771713
...
...
@@ -21,7 +21,7 @@ import (
"time"
"k8s.io/apimachinery/pkg/types"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
// WorkQueue allows queuing items with a timestamp. An item is
...
...
pkg/kubelet/util/queue/work_queue_test.go
View file @
c4771713
...
...
@@ -22,7 +22,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
func
newTestBasicWorkQueue
()
(
*
basicWorkQueue
,
*
clock
.
FakeClock
)
{
...
...
pkg/master/tunneler/BUILD
View file @
c4771713
...
...
@@ -14,8 +14,8 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/util/clock:go_default_library",
"//vendor:github.com/stretchr/testify/assert",
"//vendor:k8s.io/client-go/pkg/util/clock",
],
)
...
...
@@ -26,10 +26,10 @@ go_library(
deps = [
"//pkg/ssh:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/clock:go_default_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",
],
)
...
...
pkg/master/tunneler/ssh.go
View file @
c4771713
...
...
@@ -27,9 +27,9 @@ import (
"time"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/kubernetes/pkg/ssh"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/clock"
"github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus"
...
...
pkg/master/tunneler/ssh_test.go
View file @
c4771713
...
...
@@ -24,7 +24,7 @@ import (
"testing"
"time"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
"github.com/stretchr/testify/assert"
)
...
...
pkg/proxy/iptables/BUILD
View file @
c4771713
...
...
@@ -21,7 +21,6 @@ go_library(
"//pkg/proxy/healthcheck:go_default_library",
"//pkg/util/config:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/iptables:go_default_library",
"//pkg/util/slice:go_default_library",
"//pkg/util/sysctl:go_default_library",
...
...
@@ -30,6 +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",
],
)
...
...
pkg/proxy/iptables/proxier.go
View file @
c4771713
...
...
@@ -36,6 +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/kubernetes/pkg/api"
apiservice
"k8s.io/kubernetes/pkg/api/service"
"k8s.io/kubernetes/pkg/api/v1"
...
...
@@ -44,7 +45,6 @@ import (
"k8s.io/kubernetes/pkg/proxy/healthcheck"
featuregate
"k8s.io/kubernetes/pkg/util/config"
utilexec
"k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/flowcontrol"
utiliptables
"k8s.io/kubernetes/pkg/util/iptables"
"k8s.io/kubernetes/pkg/util/slice"
utilsysctl
"k8s.io/kubernetes/pkg/util/sysctl"
...
...
pkg/storage/BUILD
View file @
c4771713
...
...
@@ -28,7 +28,6 @@ go_library(
"//pkg/client/cache:go_default_library",
"//pkg/fields:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:golang.org/x/net/context",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
...
...
@@ -42,6 +41,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",
],
)
...
...
@@ -61,7 +61,6 @@ go_test(
"//pkg/api/v1:go_default_library",
"//pkg/client/cache:go_default_library",
"//pkg/fields:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/labels",
...
...
@@ -70,6 +69,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",
],
)
...
...
pkg/storage/watch_cache.go
View file @
c4771713
...
...
@@ -28,10 +28,10 @@ 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/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/clock"
)
const
(
...
...
pkg/storage/watch_cache_test.go
View file @
c4771713
...
...
@@ -28,11 +28,11 @@ 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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/util/clock"
)
func
makeTestPod
(
name
string
,
resourceVersion
uint64
)
*
api
.
Pod
{
...
...
pkg/util/BUILD
View file @
c4771713
...
...
@@ -52,7 +52,6 @@ filegroup(
"//pkg/util/cert:all-srcs",
"//pkg/util/chmod:all-srcs",
"//pkg/util/chown:all-srcs",
"//pkg/util/clock:all-srcs",
"//pkg/util/config:all-srcs",
"//pkg/util/configz:all-srcs",
"//pkg/util/crlf:all-srcs",
...
...
@@ -63,7 +62,6 @@ filegroup(
"//pkg/util/exec:all-srcs",
"//pkg/util/flag:all-srcs",
"//pkg/util/flock:all-srcs",
"//pkg/util/flowcontrol:all-srcs",
"//pkg/util/framer:all-srcs",
"//pkg/util/goroutinemap:all-srcs",
"//pkg/util/hash:all-srcs",
...
...
@@ -71,7 +69,6 @@ filegroup(
"//pkg/util/httpstream:all-srcs",
"//pkg/util/i18n:all-srcs",
"//pkg/util/initsystem:all-srcs",
"//pkg/util/integer:all-srcs",
"//pkg/util/interrupt:all-srcs",
"//pkg/util/intstr:all-srcs",
"//pkg/util/io:all-srcs",
...
...
pkg/util/clock/BUILD
deleted
100644 → 0
View file @
6c6616b4
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_test",
)
go_library(
name = "go_default_library",
srcs = ["clock.go"],
tags = ["automanaged"],
)
go_test(
name = "go_default_test",
srcs = ["clock_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
pkg/util/clock/clock.go
deleted
100644 → 0
View file @
6c6616b4
/*
Copyright 2014 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
clock
import
(
"sync"
"time"
)
// Clock allows for injecting fake or real clocks into code that
// needs to do arbitrary things based on time.
type
Clock
interface
{
Now
()
time
.
Time
Since
(
time
.
Time
)
time
.
Duration
After
(
d
time
.
Duration
)
<-
chan
time
.
Time
Sleep
(
d
time
.
Duration
)
Tick
(
d
time
.
Duration
)
<-
chan
time
.
Time
}
var
(
_
=
Clock
(
RealClock
{})
_
=
Clock
(
&
FakeClock
{})
_
=
Clock
(
&
IntervalClock
{})
)
// RealClock really calls time.Now()
type
RealClock
struct
{}
// Now returns the current time.
func
(
RealClock
)
Now
()
time
.
Time
{
return
time
.
Now
()
}
// Since returns time since the specified timestamp.
func
(
RealClock
)
Since
(
ts
time
.
Time
)
time
.
Duration
{
return
time
.
Since
(
ts
)
}
// Same as time.After(d).
func
(
RealClock
)
After
(
d
time
.
Duration
)
<-
chan
time
.
Time
{
return
time
.
After
(
d
)
}
func
(
RealClock
)
Tick
(
d
time
.
Duration
)
<-
chan
time
.
Time
{
return
time
.
Tick
(
d
)
}
func
(
RealClock
)
Sleep
(
d
time
.
Duration
)
{
time
.
Sleep
(
d
)
}
// FakeClock implements Clock, but returns an arbitrary time.
type
FakeClock
struct
{
lock
sync
.
RWMutex
time
time
.
Time
// waiters are waiting for the fake time to pass their specified time
waiters
[]
fakeClockWaiter
}
type
fakeClockWaiter
struct
{
targetTime
time
.
Time
stepInterval
time
.
Duration
skipIfBlocked
bool
destChan
chan
<-
time
.
Time
}
func
NewFakeClock
(
t
time
.
Time
)
*
FakeClock
{
return
&
FakeClock
{
time
:
t
,
}
}
// Now returns f's time.
func
(
f
*
FakeClock
)
Now
()
time
.
Time
{
f
.
lock
.
RLock
()
defer
f
.
lock
.
RUnlock
()
return
f
.
time
}
// Since returns time since the time in f.
func
(
f
*
FakeClock
)
Since
(
ts
time
.
Time
)
time
.
Duration
{
f
.
lock
.
RLock
()
defer
f
.
lock
.
RUnlock
()
return
f
.
time
.
Sub
(
ts
)
}
// Fake version of time.After(d).
func
(
f
*
FakeClock
)
After
(
d
time
.
Duration
)
<-
chan
time
.
Time
{
f
.
lock
.
Lock
()
defer
f
.
lock
.
Unlock
()
stopTime
:=
f
.
time
.
Add
(
d
)
ch
:=
make
(
chan
time
.
Time
,
1
)
// Don't block!
f
.
waiters
=
append
(
f
.
waiters
,
fakeClockWaiter
{
targetTime
:
stopTime
,
destChan
:
ch
,
})
return
ch
}
func
(
f
*
FakeClock
)
Tick
(
d
time
.
Duration
)
<-
chan
time
.
Time
{
f
.
lock
.
Lock
()
defer
f
.
lock
.
Unlock
()
tickTime
:=
f
.
time
.
Add
(
d
)
ch
:=
make
(
chan
time
.
Time
,
1
)
// hold one tick
f
.
waiters
=
append
(
f
.
waiters
,
fakeClockWaiter
{
targetTime
:
tickTime
,
stepInterval
:
d
,
skipIfBlocked
:
true
,
destChan
:
ch
,
})
return
ch
}
// Move clock by Duration, notify anyone that's called After or Tick
func
(
f
*
FakeClock
)
Step
(
d
time
.
Duration
)
{
f
.
lock
.
Lock
()
defer
f
.
lock
.
Unlock
()
f
.
setTimeLocked
(
f
.
time
.
Add
(
d
))
}
// Sets the time.
func
(
f
*
FakeClock
)
SetTime
(
t
time
.
Time
)
{
f
.
lock
.
Lock
()
defer
f
.
lock
.
Unlock
()
f
.
setTimeLocked
(
t
)
}
// Actually changes the time and checks any waiters. f must be write-locked.
func
(
f
*
FakeClock
)
setTimeLocked
(
t
time
.
Time
)
{
f
.
time
=
t
newWaiters
:=
make
([]
fakeClockWaiter
,
0
,
len
(
f
.
waiters
))
for
i
:=
range
f
.
waiters
{
w
:=
&
f
.
waiters
[
i
]
if
!
w
.
targetTime
.
After
(
t
)
{
if
w
.
skipIfBlocked
{
select
{
case
w
.
destChan
<-
t
:
default
:
}
}
else
{
w
.
destChan
<-
t
}
if
w
.
stepInterval
>
0
{
for
!
w
.
targetTime
.
After
(
t
)
{
w
.
targetTime
=
w
.
targetTime
.
Add
(
w
.
stepInterval
)
}
newWaiters
=
append
(
newWaiters
,
*
w
)
}
}
else
{
newWaiters
=
append
(
newWaiters
,
f
.
waiters
[
i
])
}
}
f
.
waiters
=
newWaiters
}
// Returns true if After has been called on f but not yet satisfied (so you can
// write race-free tests).
func
(
f
*
FakeClock
)
HasWaiters
()
bool
{
f
.
lock
.
RLock
()
defer
f
.
lock
.
RUnlock
()
return
len
(
f
.
waiters
)
>
0
}
func
(
f
*
FakeClock
)
Sleep
(
d
time
.
Duration
)
{
f
.
Step
(
d
)
}
// IntervalClock implements Clock, but each invocation of Now steps the clock forward the specified duration
type
IntervalClock
struct
{
Time
time
.
Time
Duration
time
.
Duration
}
// Now returns i's time.
func
(
i
*
IntervalClock
)
Now
()
time
.
Time
{
i
.
Time
=
i
.
Time
.
Add
(
i
.
Duration
)
return
i
.
Time
}
// Since returns time since the time in i.
func
(
i
*
IntervalClock
)
Since
(
ts
time
.
Time
)
time
.
Duration
{
return
i
.
Time
.
Sub
(
ts
)
}
// Unimplemented, will panic.
// TODO: make interval clock use FakeClock so this can be implemented.
func
(
*
IntervalClock
)
After
(
d
time
.
Duration
)
<-
chan
time
.
Time
{
panic
(
"IntervalClock doesn't implement After"
)
}
// Unimplemented, will panic.
// TODO: make interval clock use FakeClock so this can be implemented.
func
(
*
IntervalClock
)
Tick
(
d
time
.
Duration
)
<-
chan
time
.
Time
{
panic
(
"IntervalClock doesn't implement Tick"
)
}
func
(
*
IntervalClock
)
Sleep
(
d
time
.
Duration
)
{
panic
(
"IntervalClock doesn't implement Sleep"
)
}
pkg/util/clock/clock_test.go
deleted
100644 → 0
View file @
6c6616b4
/*
Copyright 2015 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
clock
import
(
"testing"
"time"
)
func
TestFakeClock
(
t
*
testing
.
T
)
{
startTime
:=
time
.
Now
()
tc
:=
NewFakeClock
(
startTime
)
tc
.
Step
(
time
.
Second
)
now
:=
tc
.
Now
()
if
now
.
Sub
(
startTime
)
!=
time
.
Second
{
t
.
Errorf
(
"input: %s now=%s gap=%s expected=%s"
,
startTime
,
now
,
now
.
Sub
(
startTime
),
time
.
Second
)
}
tt
:=
tc
.
Now
()
tc
.
SetTime
(
tt
.
Add
(
time
.
Hour
))
if
tc
.
Now
()
.
Sub
(
tt
)
!=
time
.
Hour
{
t
.
Errorf
(
"input: %s now=%s gap=%s expected=%s"
,
tt
,
tc
.
Now
(),
tc
.
Now
()
.
Sub
(
tt
),
time
.
Hour
)
}
}
func
TestFakeClockSleep
(
t
*
testing
.
T
)
{
startTime
:=
time
.
Now
()
tc
:=
NewFakeClock
(
startTime
)
tc
.
Sleep
(
time
.
Duration
(
1
)
*
time
.
Hour
)
now
:=
tc
.
Now
()
if
now
.
Sub
(
startTime
)
!=
time
.
Hour
{
t
.
Errorf
(
"Fake sleep failed, expected time to advance by one hour, instead, its %v"
,
now
.
Sub
(
startTime
))
}
}
func
TestFakeAfter
(
t
*
testing
.
T
)
{
tc
:=
NewFakeClock
(
time
.
Now
())
if
tc
.
HasWaiters
()
{
t
.
Errorf
(
"unexpected waiter?"
)
}
oneSec
:=
tc
.
After
(
time
.
Second
)
if
!
tc
.
HasWaiters
()
{
t
.
Errorf
(
"unexpected lack of waiter?"
)
}
oneOhOneSec
:=
tc
.
After
(
time
.
Second
+
time
.
Millisecond
)
twoSec
:=
tc
.
After
(
2
*
time
.
Second
)
select
{
case
<-
oneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
oneOhOneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
twoSec
:
t
.
Errorf
(
"unexpected channel read"
)
default
:
}
tc
.
Step
(
999
*
time
.
Millisecond
)
select
{
case
<-
oneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
oneOhOneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
twoSec
:
t
.
Errorf
(
"unexpected channel read"
)
default
:
}
tc
.
Step
(
time
.
Millisecond
)
select
{
case
<-
oneSec
:
// Expected!
case
<-
oneOhOneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
twoSec
:
t
.
Errorf
(
"unexpected channel read"
)
default
:
t
.
Errorf
(
"unexpected non-channel read"
)
}
tc
.
Step
(
time
.
Millisecond
)
select
{
case
<-
oneSec
:
// should not double-trigger!
t
.
Errorf
(
"unexpected channel read"
)
case
<-
oneOhOneSec
:
// Expected!
case
<-
twoSec
:
t
.
Errorf
(
"unexpected channel read"
)
default
:
t
.
Errorf
(
"unexpected non-channel read"
)
}
}
func
TestFakeTick
(
t
*
testing
.
T
)
{
tc
:=
NewFakeClock
(
time
.
Now
())
if
tc
.
HasWaiters
()
{
t
.
Errorf
(
"unexpected waiter?"
)
}
oneSec
:=
tc
.
Tick
(
time
.
Second
)
if
!
tc
.
HasWaiters
()
{
t
.
Errorf
(
"unexpected lack of waiter?"
)
}
oneOhOneSec
:=
tc
.
Tick
(
time
.
Second
+
time
.
Millisecond
)
twoSec
:=
tc
.
Tick
(
2
*
time
.
Second
)
select
{
case
<-
oneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
oneOhOneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
twoSec
:
t
.
Errorf
(
"unexpected channel read"
)
default
:
}
tc
.
Step
(
999
*
time
.
Millisecond
)
// t=.999
select
{
case
<-
oneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
oneOhOneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
twoSec
:
t
.
Errorf
(
"unexpected channel read"
)
default
:
}
tc
.
Step
(
time
.
Millisecond
)
// t=1.000
select
{
case
<-
oneSec
:
// Expected!
case
<-
oneOhOneSec
:
t
.
Errorf
(
"unexpected channel read"
)
case
<-
twoSec
:
t
.
Errorf
(
"unexpected channel read"
)
default
:
t
.
Errorf
(
"unexpected non-channel read"
)
}
tc
.
Step
(
time
.
Millisecond
)
// t=1.001
select
{
case
<-
oneSec
:
// should not double-trigger!
t
.
Errorf
(
"unexpected channel read"
)
case
<-
oneOhOneSec
:
// Expected!
case
<-
twoSec
:
t
.
Errorf
(
"unexpected channel read"
)
default
:
t
.
Errorf
(
"unexpected non-channel read"
)
}
tc
.
Step
(
time
.
Second
)
// t=2.001
tc
.
Step
(
time
.
Second
)
// t=3.001
tc
.
Step
(
time
.
Second
)
// t=4.001
tc
.
Step
(
time
.
Second
)
// t=5.001
// The one second ticker should not accumulate ticks
accumulatedTicks
:=
0
drained
:=
false
for
!
drained
{
select
{
case
<-
oneSec
:
accumulatedTicks
++
default
:
drained
=
true
}
}
if
accumulatedTicks
!=
1
{
t
.
Errorf
(
"unexpected number of accumulated ticks: %d"
,
accumulatedTicks
)
}
}
pkg/util/flowcontrol/BUILD
deleted
100644 → 0
View file @
6c6616b4
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_test",
)
go_library(
name = "go_default_library",
srcs = [
"backoff.go",
"throttle.go",
],
tags = ["automanaged"],
deps = [
"//pkg/util/clock:go_default_library",
"//pkg/util/integer:go_default_library",
"//vendor:github.com/juju/ratelimit",
],
)
go_test(
name = "go_default_test",
srcs = [
"backoff_test.go",
"throttle_test.go",
],
library = ":go_default_library",
tags = ["automanaged"],
deps = ["//pkg/util/clock:go_default_library"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
pkg/util/flowcontrol/backoff.go
deleted
100644 → 0
View file @
6c6616b4
/*
Copyright 2015 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
flowcontrol
import
(
"sync"
"time"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/util/integer"
)
type
backoffEntry
struct
{
backoff
time
.
Duration
lastUpdate
time
.
Time
}
type
Backoff
struct
{
sync
.
Mutex
Clock
clock
.
Clock
defaultDuration
time
.
Duration
maxDuration
time
.
Duration
perItemBackoff
map
[
string
]
*
backoffEntry
}
func
NewFakeBackOff
(
initial
,
max
time
.
Duration
,
tc
*
clock
.
FakeClock
)
*
Backoff
{
return
&
Backoff
{
perItemBackoff
:
map
[
string
]
*
backoffEntry
{},
Clock
:
tc
,
defaultDuration
:
initial
,
maxDuration
:
max
,
}
}
func
NewBackOff
(
initial
,
max
time
.
Duration
)
*
Backoff
{
return
&
Backoff
{
perItemBackoff
:
map
[
string
]
*
backoffEntry
{},
Clock
:
clock
.
RealClock
{},
defaultDuration
:
initial
,
maxDuration
:
max
,
}
}
// Get the current backoff Duration
func
(
p
*
Backoff
)
Get
(
id
string
)
time
.
Duration
{
p
.
Lock
()
defer
p
.
Unlock
()
var
delay
time
.
Duration
entry
,
ok
:=
p
.
perItemBackoff
[
id
]
if
ok
{
delay
=
entry
.
backoff
}
return
delay
}
// move backoff to the next mark, capping at maxDuration
func
(
p
*
Backoff
)
Next
(
id
string
,
eventTime
time
.
Time
)
{
p
.
Lock
()
defer
p
.
Unlock
()
entry
,
ok
:=
p
.
perItemBackoff
[
id
]
if
!
ok
||
hasExpired
(
eventTime
,
entry
.
lastUpdate
,
p
.
maxDuration
)
{
entry
=
p
.
initEntryUnsafe
(
id
)
}
else
{
delay
:=
entry
.
backoff
*
2
// exponential
entry
.
backoff
=
time
.
Duration
(
integer
.
Int64Min
(
int64
(
delay
),
int64
(
p
.
maxDuration
)))
}
entry
.
lastUpdate
=
p
.
Clock
.
Now
()
}
// Reset forces clearing of all backoff data for a given key.
func
(
p
*
Backoff
)
Reset
(
id
string
)
{
p
.
Lock
()
defer
p
.
Unlock
()
delete
(
p
.
perItemBackoff
,
id
)
}
// Returns True if the elapsed time since eventTime is smaller than the current backoff window
func
(
p
*
Backoff
)
IsInBackOffSince
(
id
string
,
eventTime
time
.
Time
)
bool
{
p
.
Lock
()
defer
p
.
Unlock
()
entry
,
ok
:=
p
.
perItemBackoff
[
id
]
if
!
ok
{
return
false
}
if
hasExpired
(
eventTime
,
entry
.
lastUpdate
,
p
.
maxDuration
)
{
return
false
}
return
p
.
Clock
.
Now
()
.
Sub
(
eventTime
)
<
entry
.
backoff
}
// Returns True if time since lastupdate is less than the current backoff window.
func
(
p
*
Backoff
)
IsInBackOffSinceUpdate
(
id
string
,
eventTime
time
.
Time
)
bool
{
p
.
Lock
()
defer
p
.
Unlock
()
entry
,
ok
:=
p
.
perItemBackoff
[
id
]
if
!
ok
{
return
false
}
if
hasExpired
(
eventTime
,
entry
.
lastUpdate
,
p
.
maxDuration
)
{
return
false
}
return
eventTime
.
Sub
(
entry
.
lastUpdate
)
<
entry
.
backoff
}
// Garbage collect records that have aged past maxDuration. Backoff users are expected
// to invoke this periodically.
func
(
p
*
Backoff
)
GC
()
{
p
.
Lock
()
defer
p
.
Unlock
()
now
:=
p
.
Clock
.
Now
()
for
id
,
entry
:=
range
p
.
perItemBackoff
{
if
now
.
Sub
(
entry
.
lastUpdate
)
>
p
.
maxDuration
*
2
{
// GC when entry has not been updated for 2*maxDuration
delete
(
p
.
perItemBackoff
,
id
)
}
}
}
func
(
p
*
Backoff
)
DeleteEntry
(
id
string
)
{
p
.
Lock
()
defer
p
.
Unlock
()
delete
(
p
.
perItemBackoff
,
id
)
}
// Take a lock on *Backoff, before calling initEntryUnsafe
func
(
p
*
Backoff
)
initEntryUnsafe
(
id
string
)
*
backoffEntry
{
entry
:=
&
backoffEntry
{
backoff
:
p
.
defaultDuration
}
p
.
perItemBackoff
[
id
]
=
entry
return
entry
}
// After 2*maxDuration we restart the backoff factor to the beginning
func
hasExpired
(
eventTime
time
.
Time
,
lastUpdate
time
.
Time
,
maxDuration
time
.
Duration
)
bool
{
return
eventTime
.
Sub
(
lastUpdate
)
>
maxDuration
*
2
// consider stable if it's ok for twice the maxDuration
}
pkg/util/flowcontrol/backoff_test.go
deleted
100644 → 0
View file @
6c6616b4
/*
Copyright 2015 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
flowcontrol
import
(
"testing"
"time"
"k8s.io/kubernetes/pkg/util/clock"
)
func
TestSlowBackoff
(
t
*
testing
.
T
)
{
id
:=
"_idSlow"
tc
:=
clock
.
NewFakeClock
(
time
.
Now
())
step
:=
time
.
Second
maxDuration
:=
50
*
step
b
:=
NewFakeBackOff
(
step
,
maxDuration
,
tc
)
cases
:=
[]
time
.
Duration
{
0
,
1
,
2
,
4
,
8
,
16
,
32
,
50
,
50
,
50
}
for
ix
,
c
:=
range
cases
{
tc
.
Step
(
step
)
w
:=
b
.
Get
(
id
)
if
w
!=
c
*
step
{
t
.
Errorf
(
"input: '%d': expected %s, got %s"
,
ix
,
c
*
step
,
w
)
}
b
.
Next
(
id
,
tc
.
Now
())
}
//Now confirm that the Reset cancels backoff.
b
.
Next
(
id
,
tc
.
Now
())
b
.
Reset
(
id
)
if
b
.
Get
(
id
)
!=
0
{
t
.
Errorf
(
"Reset didn't clear the backoff."
)
}
}
func
TestBackoffReset
(
t
*
testing
.
T
)
{
id
:=
"_idReset"
tc
:=
clock
.
NewFakeClock
(
time
.
Now
())
step
:=
time
.
Second
maxDuration
:=
step
*
5
b
:=
NewFakeBackOff
(
step
,
maxDuration
,
tc
)
startTime
:=
tc
.
Now
()
// get to backoff = maxDuration
for
i
:=
0
;
i
<=
int
(
maxDuration
/
step
);
i
++
{
tc
.
Step
(
step
)
b
.
Next
(
id
,
tc
.
Now
())
}
// backoff should be capped at maxDuration
if
!
b
.
IsInBackOffSince
(
id
,
tc
.
Now
())
{
t
.
Errorf
(
"expected to be in Backoff got %s"
,
b
.
Get
(
id
))
}
lastUpdate
:=
tc
.
Now
()
tc
.
Step
(
2
*
maxDuration
+
step
)
// time += 11s, 11 > 2*maxDuration
if
b
.
IsInBackOffSince
(
id
,
lastUpdate
)
{
t
.
Errorf
(
"expected to not be in Backoff after reset (start=%s, now=%s, lastUpdate=%s), got %s"
,
startTime
,
tc
.
Now
(),
lastUpdate
,
b
.
Get
(
id
))
}
}
func
TestBackoffHightWaterMark
(
t
*
testing
.
T
)
{
id
:=
"_idHiWaterMark"
tc
:=
clock
.
NewFakeClock
(
time
.
Now
())
step
:=
time
.
Second
maxDuration
:=
5
*
step
b
:=
NewFakeBackOff
(
step
,
maxDuration
,
tc
)
// get to backoff = maxDuration
for
i
:=
0
;
i
<=
int
(
maxDuration
/
step
);
i
++
{
tc
.
Step
(
step
)
b
.
Next
(
id
,
tc
.
Now
())
}
// backoff high watermark expires after 2*maxDuration
tc
.
Step
(
maxDuration
+
step
)
b
.
Next
(
id
,
tc
.
Now
())
if
b
.
Get
(
id
)
!=
maxDuration
{
t
.
Errorf
(
"expected Backoff to stay at high watermark %s got %s"
,
maxDuration
,
b
.
Get
(
id
))
}
}
func
TestBackoffGC
(
t
*
testing
.
T
)
{
id
:=
"_idGC"
tc
:=
clock
.
NewFakeClock
(
time
.
Now
())
step
:=
time
.
Second
maxDuration
:=
5
*
step
b
:=
NewFakeBackOff
(
step
,
maxDuration
,
tc
)
for
i
:=
0
;
i
<=
int
(
maxDuration
/
step
);
i
++
{
tc
.
Step
(
step
)
b
.
Next
(
id
,
tc
.
Now
())
}
lastUpdate
:=
tc
.
Now
()
tc
.
Step
(
maxDuration
+
step
)
b
.
GC
()
_
,
found
:=
b
.
perItemBackoff
[
id
]
if
!
found
{
t
.
Errorf
(
"expected GC to skip entry, elapsed time=%s maxDuration=%s"
,
tc
.
Now
()
.
Sub
(
lastUpdate
),
maxDuration
)
}
tc
.
Step
(
maxDuration
+
step
)
b
.
GC
()
r
,
found
:=
b
.
perItemBackoff
[
id
]
if
found
{
t
.
Errorf
(
"expected GC of entry after %s got entry %v"
,
tc
.
Now
()
.
Sub
(
lastUpdate
),
r
)
}
}
func
TestIsInBackOffSinceUpdate
(
t
*
testing
.
T
)
{
id
:=
"_idIsInBackOffSinceUpdate"
tc
:=
clock
.
NewFakeClock
(
time
.
Now
())
step
:=
time
.
Second
maxDuration
:=
10
*
step
b
:=
NewFakeBackOff
(
step
,
maxDuration
,
tc
)
startTime
:=
tc
.
Now
()
cases
:=
[]
struct
{
tick
time
.
Duration
inBackOff
bool
value
int
}{
{
tick
:
0
,
inBackOff
:
false
,
value
:
0
},
{
tick
:
1
,
inBackOff
:
false
,
value
:
1
},
{
tick
:
2
,
inBackOff
:
true
,
value
:
2
},
{
tick
:
3
,
inBackOff
:
false
,
value
:
2
},
{
tick
:
4
,
inBackOff
:
true
,
value
:
4
},
{
tick
:
5
,
inBackOff
:
true
,
value
:
4
},
{
tick
:
6
,
inBackOff
:
true
,
value
:
4
},
{
tick
:
7
,
inBackOff
:
false
,
value
:
4
},
{
tick
:
8
,
inBackOff
:
true
,
value
:
8
},
{
tick
:
9
,
inBackOff
:
true
,
value
:
8
},
{
tick
:
10
,
inBackOff
:
true
,
value
:
8
},
{
tick
:
11
,
inBackOff
:
true
,
value
:
8
},
{
tick
:
12
,
inBackOff
:
true
,
value
:
8
},
{
tick
:
13
,
inBackOff
:
true
,
value
:
8
},
{
tick
:
14
,
inBackOff
:
true
,
value
:
8
},
{
tick
:
15
,
inBackOff
:
false
,
value
:
8
},
{
tick
:
16
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
17
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
18
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
19
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
20
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
21
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
22
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
23
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
24
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
25
,
inBackOff
:
false
,
value
:
10
},
{
tick
:
26
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
27
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
28
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
29
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
30
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
31
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
32
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
33
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
34
,
inBackOff
:
true
,
value
:
10
},
{
tick
:
35
,
inBackOff
:
false
,
value
:
10
},
{
tick
:
56
,
inBackOff
:
false
,
value
:
0
},
{
tick
:
57
,
inBackOff
:
false
,
value
:
1
},
}
for
_
,
c
:=
range
cases
{
tc
.
SetTime
(
startTime
.
Add
(
c
.
tick
*
step
))
if
c
.
inBackOff
!=
b
.
IsInBackOffSinceUpdate
(
id
,
tc
.
Now
())
{
t
.
Errorf
(
"expected IsInBackOffSinceUpdate %v got %v at tick %s"
,
c
.
inBackOff
,
b
.
IsInBackOffSinceUpdate
(
id
,
tc
.
Now
()),
c
.
tick
*
step
)
}
if
c
.
inBackOff
&&
(
time
.
Duration
(
c
.
value
)
*
step
!=
b
.
Get
(
id
))
{
t
.
Errorf
(
"expected backoff value=%s got %s at tick %s"
,
time
.
Duration
(
c
.
value
)
*
step
,
b
.
Get
(
id
),
c
.
tick
*
step
)
}
if
!
c
.
inBackOff
{
b
.
Next
(
id
,
tc
.
Now
())
}
}
}
pkg/util/flowcontrol/throttle.go
deleted
100644 → 0
View file @
6c6616b4
/*
Copyright 2014 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
flowcontrol
import
(
"sync"
"github.com/juju/ratelimit"
)
type
RateLimiter
interface
{
// TryAccept returns true if a token is taken immediately. Otherwise,
// it returns false.
TryAccept
()
bool
// Accept returns once a token becomes available.
Accept
()
// Stop stops the rate limiter, subsequent calls to CanAccept will return false
Stop
()
// Saturation returns a percentage number which describes how saturated
// this rate limiter is.
// Usually we use token bucket rate limiter. In that case,
// 1.0 means no tokens are available; 0.0 means we have a full bucket of tokens to use.
Saturation
()
float64
// QPS returns QPS of this rate limiter
QPS
()
float32
}
type
tokenBucketRateLimiter
struct
{
limiter
*
ratelimit
.
Bucket
qps
float32
}
// NewTokenBucketRateLimiter creates a rate limiter which implements a token bucket approach.
// The rate limiter allows bursts of up to 'burst' to exceed the QPS, while still maintaining a
// smoothed qps rate of 'qps'.
// The bucket is initially filled with 'burst' tokens, and refills at a rate of 'qps'.
// The maximum number of tokens in the bucket is capped at 'burst'.
func
NewTokenBucketRateLimiter
(
qps
float32
,
burst
int
)
RateLimiter
{
limiter
:=
ratelimit
.
NewBucketWithRate
(
float64
(
qps
),
int64
(
burst
))
return
&
tokenBucketRateLimiter
{
limiter
:
limiter
,
qps
:
qps
,
}
}
func
(
t
*
tokenBucketRateLimiter
)
TryAccept
()
bool
{
return
t
.
limiter
.
TakeAvailable
(
1
)
==
1
}
func
(
t
*
tokenBucketRateLimiter
)
Saturation
()
float64
{
capacity
:=
t
.
limiter
.
Capacity
()
avail
:=
t
.
limiter
.
Available
()
return
float64
(
capacity
-
avail
)
/
float64
(
capacity
)
}
// Accept will block until a token becomes available
func
(
t
*
tokenBucketRateLimiter
)
Accept
()
{
t
.
limiter
.
Wait
(
1
)
}
func
(
t
*
tokenBucketRateLimiter
)
Stop
()
{
}
func
(
t
*
tokenBucketRateLimiter
)
QPS
()
float32
{
return
t
.
qps
}
type
fakeAlwaysRateLimiter
struct
{}
func
NewFakeAlwaysRateLimiter
()
RateLimiter
{
return
&
fakeAlwaysRateLimiter
{}
}
func
(
t
*
fakeAlwaysRateLimiter
)
TryAccept
()
bool
{
return
true
}
func
(
t
*
fakeAlwaysRateLimiter
)
Saturation
()
float64
{
return
0
}
func
(
t
*
fakeAlwaysRateLimiter
)
Stop
()
{}
func
(
t
*
fakeAlwaysRateLimiter
)
Accept
()
{}
func
(
t
*
fakeAlwaysRateLimiter
)
QPS
()
float32
{
return
1
}
type
fakeNeverRateLimiter
struct
{
wg
sync
.
WaitGroup
}
func
NewFakeNeverRateLimiter
()
RateLimiter
{
rl
:=
fakeNeverRateLimiter
{}
rl
.
wg
.
Add
(
1
)
return
&
rl
}
func
(
t
*
fakeNeverRateLimiter
)
TryAccept
()
bool
{
return
false
}
func
(
t
*
fakeNeverRateLimiter
)
Saturation
()
float64
{
return
1
}
func
(
t
*
fakeNeverRateLimiter
)
Stop
()
{
t
.
wg
.
Done
()
}
func
(
t
*
fakeNeverRateLimiter
)
Accept
()
{
t
.
wg
.
Wait
()
}
func
(
t
*
fakeNeverRateLimiter
)
QPS
()
float32
{
return
1
}
pkg/util/flowcontrol/throttle_test.go
deleted
100644 → 0
View file @
6c6616b4
/*
Copyright 2014 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
flowcontrol
import
(
"math"
"sync"
"testing"
"time"
)
func
TestMultithreadedThrottling
(
t
*
testing
.
T
)
{
// Bucket with 100QPS and no burst
r
:=
NewTokenBucketRateLimiter
(
100
,
1
)
// channel to collect 100 tokens
taken
:=
make
(
chan
bool
,
100
)
// Set up goroutines to hammer the throttler
startCh
:=
make
(
chan
bool
)
endCh
:=
make
(
chan
bool
)
for
i
:=
0
;
i
<
10
;
i
++
{
go
func
()
{
// wait for the starting signal
<-
startCh
for
{
// get a token
r
.
Accept
()
select
{
// try to add it to the taken channel
case
taken
<-
true
:
continue
// if taken is full, notify and return
default
:
endCh
<-
true
return
}
}
}()
}
// record wall time
startTime
:=
time
.
Now
()
// take the initial capacity so all tokens are the result of refill
r
.
Accept
()
// start the thundering herd
close
(
startCh
)
// wait for the first signal that we collected 100 tokens
<-
endCh
// record wall time
endTime
:=
time
.
Now
()
// tolerate a 1% clock change because these things happen
if
duration
:=
endTime
.
Sub
(
startTime
);
duration
<
(
time
.
Second
*
99
/
100
)
{
// We shouldn't be able to get 100 tokens out of the bucket in less than 1 second of wall clock time, no matter what
t
.
Errorf
(
"Expected it to take at least 1 second to get 100 tokens, took %v"
,
duration
)
}
else
{
t
.
Logf
(
"Took %v to get 100 tokens"
,
duration
)
}
}
func
TestBasicThrottle
(
t
*
testing
.
T
)
{
r
:=
NewTokenBucketRateLimiter
(
1
,
3
)
for
i
:=
0
;
i
<
3
;
i
++
{
if
!
r
.
TryAccept
()
{
t
.
Error
(
"unexpected false accept"
)
}
}
if
r
.
TryAccept
()
{
t
.
Error
(
"unexpected true accept"
)
}
}
func
TestIncrementThrottle
(
t
*
testing
.
T
)
{
r
:=
NewTokenBucketRateLimiter
(
1
,
1
)
if
!
r
.
TryAccept
()
{
t
.
Error
(
"unexpected false accept"
)
}
if
r
.
TryAccept
()
{
t
.
Error
(
"unexpected true accept"
)
}
// Allow to refill
time
.
Sleep
(
2
*
time
.
Second
)
if
!
r
.
TryAccept
()
{
t
.
Error
(
"unexpected false accept"
)
}
}
func
TestThrottle
(
t
*
testing
.
T
)
{
r
:=
NewTokenBucketRateLimiter
(
10
,
5
)
// Should consume 5 tokens immediately, then
// the remaining 11 should take at least 1 second (0.1s each)
expectedFinish
:=
time
.
Now
()
.
Add
(
time
.
Second
*
1
)
for
i
:=
0
;
i
<
16
;
i
++
{
r
.
Accept
()
}
if
time
.
Now
()
.
Before
(
expectedFinish
)
{
t
.
Error
(
"rate limit was not respected, finished too early"
)
}
}
func
TestRateLimiterSaturation
(
t
*
testing
.
T
)
{
const
e
=
0.000001
tests
:=
[]
struct
{
capacity
int
take
int
expectedSaturation
float64
}{
{
1
,
1
,
1
},
{
10
,
3
,
0.3
},
}
for
i
,
tt
:=
range
tests
{
rl
:=
NewTokenBucketRateLimiter
(
1
,
tt
.
capacity
)
for
i
:=
0
;
i
<
tt
.
take
;
i
++
{
rl
.
Accept
()
}
if
math
.
Abs
(
rl
.
Saturation
()
-
tt
.
expectedSaturation
)
>
e
{
t
.
Fatalf
(
"#%d: Saturation rate difference isn't within tolerable range
\n
want=%f, get=%f"
,
i
,
tt
.
expectedSaturation
,
rl
.
Saturation
())
}
}
}
func
TestAlwaysFake
(
t
*
testing
.
T
)
{
rl
:=
NewFakeAlwaysRateLimiter
()
if
!
rl
.
TryAccept
()
{
t
.
Error
(
"TryAccept in AlwaysFake should return true."
)
}
// If this will block the test will timeout
rl
.
Accept
()
}
func
TestNeverFake
(
t
*
testing
.
T
)
{
rl
:=
NewFakeNeverRateLimiter
()
if
rl
.
TryAccept
()
{
t
.
Error
(
"TryAccept in NeverFake should return false."
)
}
finished
:=
false
wg
:=
sync
.
WaitGroup
{}
wg
.
Add
(
1
)
go
func
()
{
rl
.
Accept
()
finished
=
true
wg
.
Done
()
}()
// Wait some time to make sure it never finished.
time
.
Sleep
(
time
.
Second
)
if
finished
{
t
.
Error
(
"Accept should block forever in NeverFake."
)
}
rl
.
Stop
()
wg
.
Wait
()
if
!
finished
{
t
.
Error
(
"Stop should make Accept unblock in NeverFake."
)
}
}
pkg/util/integer/BUILD
deleted
100644 → 0
View file @
6c6616b4
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_test",
)
go_library(
name = "go_default_library",
srcs = ["integer.go"],
tags = ["automanaged"],
)
go_test(
name = "go_default_test",
srcs = ["integer_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
pkg/util/integer/integer.go
deleted
100644 → 0
View file @
6c6616b4
/*
Copyright 2016 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
integer
func
IntMax
(
a
,
b
int
)
int
{
if
b
>
a
{
return
b
}
return
a
}
func
IntMin
(
a
,
b
int
)
int
{
if
b
<
a
{
return
b
}
return
a
}
func
Int32Max
(
a
,
b
int32
)
int32
{
if
b
>
a
{
return
b
}
return
a
}
func
Int32Min
(
a
,
b
int32
)
int32
{
if
b
<
a
{
return
b
}
return
a
}
func
Int64Max
(
a
,
b
int64
)
int64
{
if
b
>
a
{
return
b
}
return
a
}
func
Int64Min
(
a
,
b
int64
)
int64
{
if
b
<
a
{
return
b
}
return
a
}
// RoundToInt32 rounds floats into integer numbers.
func
RoundToInt32
(
a
float64
)
int32
{
if
a
<
0
{
return
int32
(
a
-
0.5
)
}
return
int32
(
a
+
0.5
)
}
pkg/util/integer/integer_test.go
deleted
100644 → 0
View file @
6c6616b4
/*
Copyright 2016 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
integer
import
"testing"
func
TestIntMax
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
nums
[]
int
expectedMax
int
}{
{
nums
:
[]
int
{
-
1
,
0
},
expectedMax
:
0
,
},
{
nums
:
[]
int
{
-
1
,
-
2
},
expectedMax
:
-
1
,
},
{
nums
:
[]
int
{
0
,
1
},
expectedMax
:
1
,
},
{
nums
:
[]
int
{
1
,
2
},
expectedMax
:
2
,
},
}
for
i
,
test
:=
range
tests
{
t
.
Logf
(
"executing scenario %d"
,
i
)
if
max
:=
IntMax
(
test
.
nums
[
0
],
test
.
nums
[
1
]);
max
!=
test
.
expectedMax
{
t
.
Errorf
(
"expected %v, got %v"
,
test
.
expectedMax
,
max
)
}
}
}
func
TestIntMin
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
nums
[]
int
expectedMin
int
}{
{
nums
:
[]
int
{
-
1
,
0
},
expectedMin
:
-
1
,
},
{
nums
:
[]
int
{
-
1
,
-
2
},
expectedMin
:
-
2
,
},
{
nums
:
[]
int
{
0
,
1
},
expectedMin
:
0
,
},
{
nums
:
[]
int
{
1
,
2
},
expectedMin
:
1
,
},
}
for
i
,
test
:=
range
tests
{
t
.
Logf
(
"executing scenario %d"
,
i
)
if
min
:=
IntMin
(
test
.
nums
[
0
],
test
.
nums
[
1
]);
min
!=
test
.
expectedMin
{
t
.
Errorf
(
"expected %v, got %v"
,
test
.
expectedMin
,
min
)
}
}
}
func
TestInt32Max
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
nums
[]
int32
expectedMax
int32
}{
{
nums
:
[]
int32
{
-
1
,
0
},
expectedMax
:
0
,
},
{
nums
:
[]
int32
{
-
1
,
-
2
},
expectedMax
:
-
1
,
},
{
nums
:
[]
int32
{
0
,
1
},
expectedMax
:
1
,
},
{
nums
:
[]
int32
{
1
,
2
},
expectedMax
:
2
,
},
}
for
i
,
test
:=
range
tests
{
t
.
Logf
(
"executing scenario %d"
,
i
)
if
max
:=
Int32Max
(
test
.
nums
[
0
],
test
.
nums
[
1
]);
max
!=
test
.
expectedMax
{
t
.
Errorf
(
"expected %v, got %v"
,
test
.
expectedMax
,
max
)
}
}
}
func
TestInt32Min
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
nums
[]
int32
expectedMin
int32
}{
{
nums
:
[]
int32
{
-
1
,
0
},
expectedMin
:
-
1
,
},
{
nums
:
[]
int32
{
-
1
,
-
2
},
expectedMin
:
-
2
,
},
{
nums
:
[]
int32
{
0
,
1
},
expectedMin
:
0
,
},
{
nums
:
[]
int32
{
1
,
2
},
expectedMin
:
1
,
},
}
for
i
,
test
:=
range
tests
{
t
.
Logf
(
"executing scenario %d"
,
i
)
if
min
:=
Int32Min
(
test
.
nums
[
0
],
test
.
nums
[
1
]);
min
!=
test
.
expectedMin
{
t
.
Errorf
(
"expected %v, got %v"
,
test
.
expectedMin
,
min
)
}
}
}
func
TestInt64Max
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
nums
[]
int64
expectedMax
int64
}{
{
nums
:
[]
int64
{
-
1
,
0
},
expectedMax
:
0
,
},
{
nums
:
[]
int64
{
-
1
,
-
2
},
expectedMax
:
-
1
,
},
{
nums
:
[]
int64
{
0
,
1
},
expectedMax
:
1
,
},
{
nums
:
[]
int64
{
1
,
2
},
expectedMax
:
2
,
},
}
for
i
,
test
:=
range
tests
{
t
.
Logf
(
"executing scenario %d"
,
i
)
if
max
:=
Int64Max
(
test
.
nums
[
0
],
test
.
nums
[
1
]);
max
!=
test
.
expectedMax
{
t
.
Errorf
(
"expected %v, got %v"
,
test
.
expectedMax
,
max
)
}
}
}
func
TestInt64Min
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
nums
[]
int64
expectedMin
int64
}{
{
nums
:
[]
int64
{
-
1
,
0
},
expectedMin
:
-
1
,
},
{
nums
:
[]
int64
{
-
1
,
-
2
},
expectedMin
:
-
2
,
},
{
nums
:
[]
int64
{
0
,
1
},
expectedMin
:
0
,
},
{
nums
:
[]
int64
{
1
,
2
},
expectedMin
:
1
,
},
}
for
i
,
test
:=
range
tests
{
t
.
Logf
(
"executing scenario %d"
,
i
)
if
min
:=
Int64Min
(
test
.
nums
[
0
],
test
.
nums
[
1
]);
min
!=
test
.
expectedMin
{
t
.
Errorf
(
"expected %v, got %v"
,
test
.
expectedMin
,
min
)
}
}
}
func
TestRoundToInt32
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
num
float64
exp
int32
}{
{
num
:
5.5
,
exp
:
6
,
},
{
num
:
-
3.7
,
exp
:
-
4
,
},
{
num
:
3.49
,
exp
:
3
,
},
{
num
:
-
7.9
,
exp
:
-
8
,
},
{
num
:
-
4.499999
,
exp
:
-
4
,
},
{
num
:
0
,
exp
:
0
,
},
}
for
i
,
test
:=
range
tests
{
t
.
Logf
(
"executing scenario %d"
,
i
)
if
got
:=
RoundToInt32
(
test
.
num
);
got
!=
test
.
exp
{
t
.
Errorf
(
"expected %d, got %d"
,
test
.
exp
,
got
)
}
}
}
pkg/util/metrics/BUILD
View file @
c4771713
...
...
@@ -12,10 +12,10 @@ go_library(
srcs = ["util.go"],
tags = ["automanaged"],
deps = [
"//pkg/util/flowcontrol:go_default_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",
],
)
...
...
pkg/util/metrics/util.go
View file @
c4771713
...
...
@@ -22,7 +22,7 @@ import (
"time"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/
kubernetes
/pkg/util/flowcontrol"
"k8s.io/
client-go
/pkg/util/flowcontrol"
"github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus"
...
...
pkg/util/workqueue/BUILD
View file @
c4771713
...
...
@@ -22,9 +22,9 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//pkg/util/clock:go_default_library",
"//vendor:github.com/juju/ratelimit",
"//vendor:k8s.io/apimachinery/pkg/util/runtime",
"//vendor:k8s.io/client-go/pkg/util/clock",
],
)
...
...
@@ -40,8 +40,8 @@ go_test(
tags = ["automanaged"],
deps = [
"//pkg/api/v1:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/client-go/pkg/util/clock",
],
)
...
...
pkg/util/workqueue/delaying_queue.go
View file @
c4771713
...
...
@@ -21,7 +21,7 @@ import (
"time"
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
// DelayingInterface is an Interface that can Add an item at a later time. This makes it easier to
...
...
pkg/util/workqueue/delaying_queue_test.go
View file @
c4771713
...
...
@@ -23,7 +23,7 @@ import (
"time"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
func
TestSimpleQueue
(
t
*
testing
.
T
)
{
...
...
pkg/util/workqueue/rate_limitting_queue_test.go
View file @
c4771713
...
...
@@ -20,7 +20,7 @@ import (
"testing"
"time"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
)
func
TestRateLimitingQueue
(
t
*
testing
.
T
)
{
...
...
plugin/pkg/admission/namespace/lifecycle/BUILD
View file @
c4771713
...
...
@@ -18,13 +18,13 @@ go_library(
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/controller/informers:go_default_library",
"//pkg/kubeapiserver/admission:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:github.com/golang/glog",
"//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/apiserver/pkg/admission",
"//vendor:k8s.io/apiserver/pkg/util/cache",
"//vendor:k8s.io/client-go/pkg/util/clock",
],
)
...
...
@@ -40,12 +40,12 @@ go_test(
"//pkg/client/testing/core:go_default_library",
"//pkg/controller/informers:go_default_library",
"//pkg/kubeapiserver/admission:go_default_library",
"//pkg/util/clock:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//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",
],
)
...
...
plugin/pkg/admission/namespace/lifecycle/admission.go
View file @
c4771713
...
...
@@ -28,12 +28,12 @@ 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/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/controller/informers"
kubeapiserveradmission
"k8s.io/kubernetes/pkg/kubeapiserver/admission"
"k8s.io/kubernetes/pkg/util/clock"
)
const
(
...
...
plugin/pkg/admission/namespace/lifecycle/admission_test.go
View file @
c4771713
...
...
@@ -26,13 +26,13 @@ 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/kubernetes/pkg/api"
clientset
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
"k8s.io/kubernetes/pkg/client/testing/core"
"k8s.io/kubernetes/pkg/controller/informers"
kubeadmission
"k8s.io/kubernetes/pkg/kubeapiserver/admission"
"k8s.io/kubernetes/pkg/util/clock"
)
// newHandlerForTest returns a configured handler for testing.
...
...
staging/copy.sh
View file @
c4771713
...
...
@@ -72,6 +72,9 @@ function save() {
save
"transport"
save
"tools/clientcmd/api"
save
"rest/watch"
save
"pkg/util/clock"
save
"pkg/util/integer"
save
"pkg/util/flowcontrol"
...
...
staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go
View file @
c4771713
...
...
@@ -20,7 +20,7 @@ import (
"testing"
"time"
"k8s.io/
kubernetes
/pkg/util/clock"
"k8s.io/
client-go
/pkg/util/clock"
"github.com/golang/groupcache/lru"
)
...
...
test/e2e/BUILD
View file @
c4771713
...
...
@@ -143,7 +143,6 @@ go_library(
"//pkg/security/apparmor:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/flowcontrol:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/util/logs:go_default_library",
"//pkg/util/system:go_default_library",
...
...
@@ -196,6 +195,7 @@ 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/transport",
],
...
...
test/e2e/service_latency.go
View file @
c4771713
...
...
@@ -26,10 +26,10 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/test/e2e/framework"
testutils
"k8s.io/kubernetes/test/utils"
...
...
vendor/BUILD
View file @
c4771713
...
...
@@ -9084,8 +9084,8 @@ go_test(
library = ":k8s.io/apiserver/pkg/util/cache",
tags = ["automanaged"],
deps = [
"//pkg/util/clock:go_default_library",
"//vendor:github.com/golang/groupcache/lru",
"//vendor:k8s.io/client-go/pkg/util/clock",
],
)
...
...
@@ -13638,82 +13638,3 @@ go_library(
"//vendor:k8s.io/client-go/pkg/apis/rbac",
],
)
go_library(
name = "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
srcs = [
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/doc.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/generated_expansion.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go",
],
tags = ["automanaged"],
deps = [
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
"//vendor:k8s.io/apimachinery/pkg/types",
"//vendor:k8s.io/apimachinery/pkg/watch",
"//vendor:k8s.io/client-go/pkg/api",
"//vendor:k8s.io/client-go/pkg/api/v1",
"//vendor:k8s.io/client-go/pkg/apis/rbac/v1beta1",
"//vendor:k8s.io/client-go/rest",
],
)
go_library(
name = "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
srcs = [
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/doc.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_rbac_client.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_role.go",
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go",
],
tags = ["automanaged"],
deps = [
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/labels",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apimachinery/pkg/types",
"//vendor:k8s.io/apimachinery/pkg/watch",
"//vendor:k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
"//vendor:k8s.io/client-go/pkg/api/v1",
"//vendor:k8s.io/client-go/pkg/apis/rbac/v1beta1",
"//vendor:k8s.io/client-go/rest",
"//vendor:k8s.io/client-go/testing",
],
)
go_library(
name = "k8s.io/client-go/pkg/apis/rbac/v1beta1",
srcs = [
"k8s.io/client-go/pkg/apis/rbac/v1beta1/defaults.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/doc.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.pb.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/helpers.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/register.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/types.generated.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/types.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/types_swagger_doc_generated.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.conversion.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.deepcopy.go",
"k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.defaults.go",
],
tags = ["automanaged"],
deps = [
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/ugorji/go/codec",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/conversion",
"//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/api/v1",
"//vendor:k8s.io/client-go/pkg/apis/rbac",
],
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment