github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-03 10:17:46 +00:00
Code Issues Projects Releases Wiki Activity

feat: make loadConfig and loadConfigFile public functions

Browse Source 
- so that users who import kube-scheduler libraries can use these functions to read kube scheduler config
This commit is contained in:
vadasambar
2023-07-04 10:32:14 +05:30
parent 406d2dfe61
commit 8e284389a5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kube-scheduler/app/options/configfile.go
View File

@@ -30,16 +30,16 @@ import (
configv1beta3 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3" configv1beta3 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3"
) )
func loadConfigFromFile(logger klog.Logger, file string) (*config.KubeSchedulerConfiguration, error) { func LoadConfigFromFile(logger klog.Logger, file string) (*config.KubeSchedulerConfiguration, error) {
data, err := os.ReadFile(file) data, err := os.ReadFile(file)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return loadConfig(logger, data) return LoadConfig(logger, data)
} }
func loadConfig(logger klog.Logger, data []byte) (*config.KubeSchedulerConfiguration, error) { func LoadConfig(logger klog.Logger, data []byte) (*config.KubeSchedulerConfiguration, error) {
// The UniversalDecoder runs defaulting and returns the internal type by default. // The UniversalDecoder runs defaulting and returns the internal type by default.
obj, gvk, err := scheme.Codecs.UniversalDecoder().Decode(data, nil, nil) obj, gvk, err := scheme.Codecs.UniversalDecoder().Decode(data, nil, nil)
if err != nil { if err != nil {

2
cmd/kube-scheduler/app/options/options.go
View File

@@ -204,7 +204,7 @@ func (o *Options) ApplyTo(logger klog.Logger, c *schedulerappconfig.Config) erro
o.ApplyLeaderElectionTo(o.ComponentConfig) o.ApplyLeaderElectionTo(o.ComponentConfig)
c.ComponentConfig = *o.ComponentConfig c.ComponentConfig = *o.ComponentConfig
} else { } else {
cfg, err := loadConfigFromFile(logger, o.ConfigFile) cfg, err := LoadConfigFromFile(logger, o.ConfigFile)
if err != nil { if err != nil {
return err return err
} }