diff --git a/plugin/cmd/kube-scheduler/app/configurator.go b/plugin/cmd/kube-scheduler/app/configurator.go index c1e759e91d6..c6aba6486b6 100644 --- a/plugin/cmd/kube-scheduler/app/configurator.go +++ b/plugin/cmd/kube-scheduler/app/configurator.go @@ -29,7 +29,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" clientset "k8s.io/client-go/kubernetes" @@ -57,11 +56,10 @@ func createRecorder(kubecli *clientset.Clientset, s *options.SchedulerServer) re return eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: s.SchedulerName}) } -// TODO: convert scheduler to only use client-go's clientset. -func createClient(s *options.SchedulerServer) (*clientset.Clientset, *kubernetes.Clientset, error) { +func createClient(s *options.SchedulerServer) (*clientset.Clientset, error) { kubeconfig, err := clientcmd.BuildConfigFromFlags(s.Master, s.Kubeconfig) if err != nil { - return nil, nil, fmt.Errorf("unable to build config from flags: %v", err) + return nil, fmt.Errorf("unable to build config from flags: %v", err) } kubeconfig.ContentType = s.ContentType @@ -71,13 +69,9 @@ func createClient(s *options.SchedulerServer) (*clientset.Clientset, *kubernetes cli, err := clientset.NewForConfig(restclient.AddUserAgent(kubeconfig, "leader-election")) if err != nil { - return nil, nil, fmt.Errorf("invalid API configuration: %v", err) + return nil, fmt.Errorf("invalid API configuration: %v", err) } - clientgoCli, err := kubernetes.NewForConfig(restclient.AddUserAgent(kubeconfig, "leader-election")) - if err != nil { - return nil, nil, fmt.Errorf("invalid API configuration: %v", err) - } - return cli, clientgoCli, nil + return cli, nil } // CreateScheduler encapsulates the entire creation of a runnable scheduler. diff --git a/plugin/cmd/kube-scheduler/app/server.go b/plugin/cmd/kube-scheduler/app/server.go index f16469bf98c..4e339ff4005 100644 --- a/plugin/cmd/kube-scheduler/app/server.go +++ b/plugin/cmd/kube-scheduler/app/server.go @@ -65,7 +65,7 @@ through the API as necessary.`, // Run runs the specified SchedulerServer. This should never exit. func Run(s *options.SchedulerServer) error { - kubecli, clientgoCli, err := createClient(s) + kubecli, err := createClient(s) if err != nil { return fmt.Errorf("unable to create kube client: %v", err) } @@ -121,7 +121,7 @@ func Run(s *options.SchedulerServer) error { rl, err := resourcelock.New(s.LeaderElection.ResourceLock, s.LockObjectNamespace, s.LockObjectName, - clientgoCli, + kubecli, resourcelock.ResourceLockConfig{ Identity: id, EventRecorder: recorder,