diff --git a/pkg/cmd/init.go b/pkg/cmd/init.go index 80908022fd..cb0b6d75b1 100644 --- a/pkg/cmd/init.go +++ b/pkg/cmd/init.go @@ -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 } diff --git a/pkg/config/kube-scheduler.go b/pkg/config/kube-scheduler.go deleted file mode 100644 index f7ff84fb13..0000000000 --- a/pkg/config/kube-scheduler.go +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright © 2021 Microshift Contributors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -package config - -import ( - "io/ioutil" - "os" - "path/filepath" -) - -// KubeSchedulerConfig creates a config for kube-scheduler in option --config -func KubeSchedulerConfig(cfg *MicroshiftConfig) error { - data := []byte(`apiVersion: kubescheduler.config.k8s.io/v1beta1 -kind: KubeSchedulerConfiguration -clientConnection: - kubeconfig: ` + cfg.DataDir + `/resources/kube-scheduler/kubeconfig -leaderElection: - leaderElect: false`) - - os.MkdirAll(filepath.Dir(cfg.DataDir+"/resources/kube-scheduler/config/config.yaml"), os.FileMode(0755)) - return ioutil.WriteFile(cfg.DataDir+"/resources/kube-scheduler/config/config.yaml", data, 0644) -} diff --git a/pkg/controllers/kube-scheduler.go b/pkg/controllers/kube-scheduler.go index 1b8aa1af08..0ea93af3c7 100644 --- a/pkg/controllers/kube-scheduler.go +++ b/pkg/controllers/kube-scheduler.go @@ -17,6 +17,8 @@ package controllers import ( "context" + "io/ioutil" + "os" "path/filepath" "strconv" @@ -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() @@ -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)