invalid config file should not be ignored (#5228)
fix the invalid config file should not be ignored
This commit is contained in:
@@ -73,7 +73,7 @@ func NewControllerManagerCommand() *cobra.Command {
|
||||
WebhookCertDir: s.WebhookCertDir,
|
||||
}
|
||||
} else {
|
||||
klog.Fatal("Failed to load configuration from disk", err)
|
||||
klog.Fatalf("Failed to load configuration from disk: %v", err)
|
||||
}
|
||||
|
||||
cmd := &cobra.Command{
|
||||
|
||||
@@ -43,7 +43,7 @@ func NewAPIServerCommand() *cobra.Command {
|
||||
if err == nil {
|
||||
s.Config = conf
|
||||
} else {
|
||||
klog.Fatal("Failed to load configuration from disk", err)
|
||||
klog.Fatalf("Failed to load configuration from disk: %v", err)
|
||||
}
|
||||
|
||||
cmd := &cobra.Command{
|
||||
|
||||
@@ -110,7 +110,7 @@ func (c *config) watchConfig() <-chan Config {
|
||||
viper.OnConfigChange(func(in fsnotify.Event) {
|
||||
cfg := New()
|
||||
if err := viper.Unmarshal(cfg); err != nil {
|
||||
klog.Warning("config reload error", err)
|
||||
klog.Warningf("config reload error: %v", err)
|
||||
} else {
|
||||
c.cfgChangeCh <- *cfg
|
||||
}
|
||||
@@ -123,9 +123,7 @@ func (c *config) loadFromDisk() (*Config, error) {
|
||||
var err error
|
||||
c.loadOnce.Do(func() {
|
||||
if err = viper.ReadInConfig(); err != nil {
|
||||
if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
|
||||
err = fmt.Errorf("error parsing configuration file %s", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
err = viper.Unmarshal(c.cfg)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user