Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #53793 upstream release 1.7 #53884

Merged
merged 1 commit into from
Oct 13, 2017
Merged

Automated cherry pick of #53793 upstream release 1.7 #53884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions plugin/cmd/kube-scheduler/app/configurator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,22 @@ func createRecorder(kubecli *clientset.Clientset, s *options.SchedulerServer) re
return eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: s.SchedulerName})
}

func createClient(s *options.SchedulerServer) (*clientset.Clientset, error) {
func createClients(s *options.SchedulerServer) (*clientset.Clientset, *clientset.Clientset, error) {
kubeconfig, err := clientcmd.BuildConfigFromFlags(s.Master, s.Kubeconfig)
if err != nil {
return nil, fmt.Errorf("unable to build config from flags: %v", err)
return nil, nil, fmt.Errorf("unable to build config from flags: %v", err)
}

kubeconfig.ContentType = s.ContentType
// Override kubeconfig qps/burst settings from flags
kubeconfig.QPS = s.KubeAPIQPS
kubeconfig.Burst = int(s.KubeAPIBurst)

cli, err := clientset.NewForConfig(restclient.AddUserAgent(kubeconfig, "leader-election"))
kubeClient, err := clientset.NewForConfig(restclient.AddUserAgent(kubeconfig, "scheduler"))
if err != nil {
return nil, fmt.Errorf("invalid API configuration: %v", err)
glog.Fatalf("Invalid API configuration: %v", err)
}
return cli, nil
leaderElectionClient := clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "leader-election"))
return kubeClient, leaderElectionClient, nil
}

// CreateScheduler encapsulates the entire creation of a runnable scheduler.
Expand Down
12 changes: 6 additions & 6 deletions plugin/cmd/kube-scheduler/app/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,20 @@ through the API as necessary.`,

// Run runs the specified SchedulerServer. This should never exit.
func Run(s *options.SchedulerServer) error {
kubecli, err := createClient(s)
kubeClient, leaderElectionClient, err := createClients(s)
if err != nil {
return fmt.Errorf("unable to create kube client: %v", err)
}

recorder := createRecorder(kubecli, s)
recorder := createRecorder(kubeClient, s)

informerFactory := informers.NewSharedInformerFactory(kubecli, 0)
informerFactory := informers.NewSharedInformerFactory(kubeClient, 0)
// cache only non-terminal pods
podInformer := factory.NewPodInformer(kubecli, 0)
podInformer := factory.NewPodInformer(kubeClient, 0)

sched, err := CreateScheduler(
s,
kubecli,
kubeClient,
informerFactory.Core().V1().Nodes(),
podInformer,
informerFactory.Core().V1().PersistentVolumes(),
Expand Down Expand Up @@ -121,7 +121,7 @@ func Run(s *options.SchedulerServer) error {
rl, err := resourcelock.New(s.LeaderElection.ResourceLock,
s.LockObjectNamespace,
s.LockObjectName,
kubecli,
leaderElectionClient,
resourcelock.ResourceLockConfig{
Identity: id,
EventRecorder: recorder,
Expand Down