diff --git a/controllers/nginx-alpha/controller.go b/controllers/nginx-alpha/controller.go index e837e3efc..df476238b 100644 --- a/controllers/nginx-alpha/controller.go +++ b/controllers/nginx-alpha/controller.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/flowcontrol" ) const ( @@ -69,7 +69,7 @@ func main() { ingClient = kubeClient.Extensions().Ingress(api.NamespaceAll) } tmpl, _ := template.New("nginx").Parse(nginxConf) - rateLimiter := util.NewTokenBucketRateLimiter(0.1, 1) + rateLimiter := flowcontrol.NewTokenBucketRateLimiter(0.1, 1) known := &extensions.IngressList{} // Controller loop diff --git a/controllers/nginx/nginx/main.go b/controllers/nginx/nginx/main.go index 66c702c89..5c6deb1d9 100644 --- a/controllers/nginx/nginx/main.go +++ b/controllers/nginx/nginx/main.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/flowcontrol" ) const ( @@ -227,7 +227,7 @@ type Manager struct { sslDHParam string - reloadRateLimiter util.RateLimiter + reloadRateLimiter flowcontrol.RateLimiter // template loaded ready to be used to generate the nginx configuration file template *template.Template @@ -280,7 +280,7 @@ func NewManager(kubeClient *client.Client) *Manager { defCfg: newDefaultNginxCfg(), defResolver: strings.Join(getDNSServers(), " "), reloadLock: &sync.Mutex{}, - reloadRateLimiter: util.NewTokenBucketRateLimiter(0.1, 1), + reloadRateLimiter: flowcontrol.NewTokenBucketRateLimiter(0.1, 1), } ngx.createCertsDir(sslDirectory)