rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-04 08:45:22 +00:00
Code Issues Releases Wiki Activity

Fixes to adapt to 1.10.5

Browse Source
This commit is contained in:
Alena Prokharchyk
2018-07-11 16:42:25 -07:00
parent d7ac071df7
commit 26d279bce1
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,3 +4,4 @@
/dist /dist
*.swp *.swp
/.trash-cache /.trash-cache
/trash.lock

4
controller/generic_controller.go
View File

@@ -7,11 +7,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/juju/ratelimit"
errors2 "github.com/pkg/errors" errors2 "github.com/pkg/errors"
"github.com/rancher/norman/objectclient" "github.com/rancher/norman/objectclient"
"github.com/rancher/norman/types" "github.com/rancher/norman/types"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/time/rate"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@@ -69,7 +69,7 @@ func NewGenericController(name string, genericClient Backend) GenericController
rl := workqueue.NewMaxOfRateLimiter( rl := workqueue.NewMaxOfRateLimiter(
workqueue.NewItemExponentialFailureRateLimiter(500*time.Millisecond, 1000*time.Second), 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) // 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{ return &genericController{

4
leader/leader.go
View File

@@ -11,7 +11,7 @@ import (
"k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/leaderelection"
"k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/client/leaderelectionconfig" "k8s.io/kubernetes/pkg/client/leaderelectionconfig"
) )
@@ -73,5 +73,5 @@ func createRecorder(name string, kubeClient kubernetes.Interface) record.EventRe
eventBroadcaster := record.NewBroadcaster() eventBroadcaster := record.NewBroadcaster()
eventBroadcaster.StartLogging(logrus.Infof) eventBroadcaster.StartLogging(logrus.Infof)
eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.CoreV1().RESTClient()).Events("")}) 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})
} }