github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix duplication in scheduler.

Browse Source
This commit is contained in:
Avesh Agarwal 2017-07-21 13:51:31 -04:00
parent 86b2fd380d
commit 2ca4563be9
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/cmd/kube-scheduler/app/configurator.go
View File

@ -29,7 +29,6 @@ import (
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"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/kubernetes"
v1core "k8s.io/client-go/kubernetes/typed/core/v1" v1core "k8s.io/client-go/kubernetes/typed/core/v1"
clientset "k8s.io/client-go/kubernetes" 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}) 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, error) {
func createClient(s *options.SchedulerServer) (*clientset.Clientset, *kubernetes.Clientset, error) {
kubeconfig, err := clientcmd.BuildConfigFromFlags(s.Master, s.Kubeconfig) kubeconfig, err := clientcmd.BuildConfigFromFlags(s.Master, s.Kubeconfig)
if err != nil { 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 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")) cli, err := clientset.NewForConfig(restclient.AddUserAgent(kubeconfig, "leader-election"))
if err != nil { 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")) return cli, nil
if err != nil {
return nil, nil, fmt.Errorf("invalid API configuration: %v", err)
}
return cli, clientgoCli, nil
} }
// CreateScheduler encapsulates the entire creation of a runnable scheduler. // CreateScheduler encapsulates the entire creation of a runnable scheduler.

4
plugin/cmd/kube-scheduler/app/server.go
View File

@ -65,7 +65,7 @@ through the API as necessary.`,
// Run runs the specified SchedulerServer. This should never exit. // Run runs the specified SchedulerServer. This should never exit.
func Run(s *options.SchedulerServer) error { func Run(s *options.SchedulerServer) error {
kubecli, clientgoCli, err := createClient(s) kubecli, err := createClient(s)
if err != nil { if err != nil {
return fmt.Errorf("unable to create kube client: %v", err) 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, rl, err := resourcelock.New(s.LeaderElection.ResourceLock,
s.LockObjectNamespace, s.LockObjectNamespace,
s.LockObjectName, s.LockObjectName,
clientgoCli, kubecli,
resourcelock.ResourceLockConfig{ resourcelock.ResourceLockConfig{
Identity: id, Identity: id,
EventRecorder: recorder, EventRecorder: recorder,