diff --git a/cmd/controller-manager/app/server.go b/cmd/controller-manager/app/server.go index 95c9470dd..8261d26a1 100644 --- a/cmd/controller-manager/app/server.go +++ b/cmd/controller-manager/app/server.go @@ -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{ diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go index 19c1b8ac2..8f3456952 100644 --- a/cmd/ks-apiserver/app/server.go +++ b/cmd/ks-apiserver/app/server.go @@ -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{ diff --git a/pkg/apiserver/config/config.go b/pkg/apiserver/config/config.go index aee9996e8..52f27084c 100644 --- a/pkg/apiserver/config/config.go +++ b/pkg/apiserver/config/config.go @@ -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) })