Merge pull request #760 from aledbf/refactor-locks

Change recorder event scheme
kubernetes · May 24, 2017 · 675296d · 675296d
2 parents 9bdbba4 + 797560a
commit 675296d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go
@@ -32,8 +32,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/scheme"
 	unversionedcore "k8s.io/client-go/kubernetes/typed/core/v1"
-	def_api "k8s.io/client-go/pkg/api"
 	api "k8s.io/client-go/pkg/api/v1"
 	extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
@@ -153,7 +153,7 @@ func newIngressController(config *Configuration) *GenericController {
 		stopLock:        &sync.Mutex{},
 		stopCh:          make(chan struct{}),
 		syncRateLimiter: flowcontrol.NewTokenBucketRateLimiter(0.5, 1),
-		recorder: eventBroadcaster.NewRecorder(def_api.Scheme, api.EventSource{
+		recorder: eventBroadcaster.NewRecorder(scheme.Scheme, api.EventSource{
 			Component: "ingress-controller",
 		}),
 		sslCertTracker: newSSLCertTracker(),

diff --git a/core/pkg/ingress/status/election.go b/core/pkg/ingress/status/election.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	client "k8s.io/client-go/kubernetes"
-	def_api "k8s.io/client-go/pkg/api"
+	"k8s.io/client-go/kubernetes/scheme"
 	api "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/record"
 
@@ -96,7 +96,7 @@ func NewElection(electionID,
 	if err != nil {
 		return nil, err
 	}
-	recorder := broadcaster.NewRecorder(def_api.Scheme, api.EventSource{
+	recorder := broadcaster.NewRecorder(scheme.Scheme, api.EventSource{
 		Component: "ingress-leader-elector",
 		Host:      hostname,
 	})