Move ScheduledJob controller to use generated clientset

cmd/kube-controller-manager/app/controllermanager.go

@@ -404,13 +404,9 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
 		glog.Infof("Starting %s apis", groupVersion)
 		if containsResource(resources, "scheduledjobs") {
 			glog.Infof("Starting scheduledjob controller")
-			// TODO: this is a temp fix for allowing kubeClient list v2alpha1 sj, should switch to using clientset
+			// // TODO: this is a temp fix for allowing kubeClient list v2alpha1 sj, should switch to using clientset
 			kubeconfig.ContentConfig.GroupVersion = &unversioned.GroupVersion{Group: batch.GroupName, Version: "v2alpha1"}
-			kubeClient, err := client.New(kubeconfig)
+			go scheduledjob.NewScheduledJobController(clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "scheduledjob-controller"))).
-			if err != nil {
-				glog.Fatalf("Invalid API configuration: %v", err)
-			}
-			go scheduledjob.NewScheduledJobController(kubeClient).
 				Run(wait.NeverStop)
 			time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
 			time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))

pkg/controller/scheduledjob/controller.go

@@ -38,8 +38,9 @@ import (
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/batch"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned"
 	"k8s.io/kubernetes/pkg/client/record"
-	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/controller/job"
 	"k8s.io/kubernetes/pkg/runtime"
 	utilerrors "k8s.io/kubernetes/pkg/util/errors"
@@ -51,21 +52,21 @@ import (
 // Utilities for dealing with Jobs and ScheduledJobs and time.
 
 type ScheduledJobController struct {
-	kubeClient *client.Client
+	kubeClient clientset.Interface
 	jobControl jobControlInterface
 	sjControl  sjControlInterface
 	podControl podControlInterface
 	recorder   record.EventRecorder
 }
 
-func NewScheduledJobController(kubeClient *client.Client) *ScheduledJobController {
+func NewScheduledJobController(kubeClient clientset.Interface) *ScheduledJobController {
 	eventBroadcaster := record.NewBroadcaster()
 	eventBroadcaster.StartLogging(glog.Infof)
 	// TODO: remove the wrapper when every clients have moved to use the clientset.
-	eventBroadcaster.StartRecordingToSink(kubeClient.Events(""))
+	eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{Interface: kubeClient.Core().Events("")})
 
-	if kubeClient != nil && kubeClient.GetRateLimiter() != nil {
+	if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil {
-		metrics.RegisterMetricAndTrackRateLimiterUsage("scheduledjob_controller", kubeClient.GetRateLimiter())
+		metrics.RegisterMetricAndTrackRateLimiterUsage("scheduledjob_controller", kubeClient.Core().GetRESTClient().GetRateLimiter())
 	}
 
 	jm := &ScheduledJobController{
@@ -73,13 +74,13 @@ func NewScheduledJobController(kubeClient *client.Client) *ScheduledJobControlle
 		jobControl: realJobControl{KubeClient: kubeClient},
 		sjControl:  &realSJControl{KubeClient: kubeClient},
 		podControl: &realPodControl{KubeClient: kubeClient},
-		recorder:   eventBroadcaster.NewRecorder(api.EventSource{Component: "scheduled-job-controller"}),
+		recorder:   eventBroadcaster.NewRecorder(api.EventSource{Component: "scheduledjob-controller"}),
 	}
 
 	return jm
 }
 
-func NewScheduledJobControllerFromClient(kubeClient *client.Client) *ScheduledJobController {
+func NewScheduledJobControllerFromClient(kubeClient clientset.Interface) *ScheduledJobController {
 	jm := NewScheduledJobController(kubeClient)
 	return jm
 }

pkg/controller/scheduledjob/injection.go

@@ -21,8 +21,8 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/batch"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/record"
-	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/labels"
 )
 
@@ -34,7 +34,7 @@ type sjControlInterface interface {
 
 // realSJControl is the default implementation of sjControlInterface.
 type realSJControl struct {
-	KubeClient *client.Client
+	KubeClient clientset.Interface
 }
 
 var _ sjControlInterface = &realSJControl{}
@@ -73,7 +73,7 @@ type jobControlInterface interface {
 
 // realJobControl is the default implementation of jobControlInterface.
 type realJobControl struct {
-	KubeClient *client.Client
+	KubeClient clientset.Interface
 	Recorder   record.EventRecorder
 }
 
@@ -182,18 +182,18 @@ type podControlInterface interface {
 
 // realPodControl is the default implementation of podControlInterface.
 type realPodControl struct {
-	KubeClient *client.Client
+	KubeClient clientset.Interface
 	Recorder   record.EventRecorder
 }
 
 var _ podControlInterface = &realPodControl{}
 
 func (r realPodControl) ListPods(namespace string, opts api.ListOptions) (*api.PodList, error) {
-	return r.KubeClient.Pods(namespace).List(opts)
+	return r.KubeClient.Core().Pods(namespace).List(opts)
 }
 
 func (r realPodControl) DeletePod(namespace string, name string) error {
-	return r.KubeClient.Pods(namespace).Delete(name, nil)
+	return r.KubeClient.Core().Pods(namespace).Delete(name, nil)
 }
 
 type fakePodControl struct {