Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ func initServerConfig(cfg *config.MicroshiftConfig) error {
if err := config.OpenShiftControllerManagerConfig(cfg); err != nil {
return err
}
if err := config.KubeSchedulerConfig(cfg); err != nil {
return err
}
return nil
}

Expand Down
35 changes: 0 additions & 35 deletions pkg/config/kube-scheduler.go

This file was deleted.

19 changes: 17 additions & 2 deletions pkg/controllers/kube-scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ package controllers

import (
"context"
"io/ioutil"
"os"
"path/filepath"
"strconv"

Expand Down Expand Up @@ -48,8 +50,8 @@ func (s *KubeScheduler) Name() string { return "kube-scheduler" }
func (s *KubeScheduler) Dependencies() []string { return []string{"kube-apiserver"} }

func (s *KubeScheduler) configure(cfg *config.MicroshiftConfig) {
if err := config.KubeSchedulerConfig(cfg); err != nil {
return
if err := s.writeConfig(cfg); err != nil {
logrus.Fatalf("failed to write kube-scheduler config: %v", err)
}

opts, err := schedulerOptions.NewOptions()
Expand Down Expand Up @@ -90,6 +92,19 @@ func (s *KubeScheduler) configure(cfg *config.MicroshiftConfig) {

}

func (s *KubeScheduler) writeConfig(cfg *config.MicroshiftConfig) error {
data := []byte(`apiVersion: kubescheduler.config.k8s.io/v1beta1
kind: KubeSchedulerConfiguration
clientConnection:
kubeconfig: ` + cfg.DataDir + `/resources/kube-scheduler/kubeconfig
leaderElection:
leaderElect: false`)

path := filepath.Join(cfg.DataDir, "resources", "kube-scheduler", "config", "config.yaml")
os.MkdirAll(filepath.Dir(path), os.FileMode(0755))
return ioutil.WriteFile(path, data, 0644)
}

func (s *KubeScheduler) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
defer close(stopped)

Expand Down