diff --git a/.gitignore b/.gitignore index 585d0fae..a10e060c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dist *.swp /.trash-cache +/trash.lock diff --git a/controller/generic_controller.go b/controller/generic_controller.go index 7a6c0208..eff4c274 100644 --- a/controller/generic_controller.go +++ b/controller/generic_controller.go @@ -7,11 +7,11 @@ import ( "sync" "time" - "github.com/juju/ratelimit" errors2 "github.com/pkg/errors" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/types" "github.com/sirupsen/logrus" + "golang.org/x/time/rate" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -69,7 +69,7 @@ func NewGenericController(name string, genericClient Backend) GenericController rl := workqueue.NewMaxOfRateLimiter( workqueue.NewItemExponentialFailureRateLimiter(500*time.Millisecond, 1000*time.Second), // 10 qps, 100 bucket size. This is only for retry speed and its only the overall factor (not per item) - &workqueue.BucketRateLimiter{Bucket: ratelimit.NewBucketWithRate(float64(10), int64(100))}, + &workqueue.BucketRateLimiter{Limiter: rate.NewLimiter(rate.Limit(10), 100)}, ) return &genericController{ diff --git a/leader/leader.go b/leader/leader.go index 75206f5f..a564e54d 100644 --- a/leader/leader.go +++ b/leader/leader.go @@ -11,7 +11,7 @@ import ( "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/record" - "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/client/leaderelectionconfig" ) @@ -73,5 +73,5 @@ func createRecorder(name string, kubeClient kubernetes.Interface) record.EventRe eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(logrus.Infof) eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.CoreV1().RESTClient()).Events("")}) - return eventBroadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: name}) + return eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: name}) }