From 2f7c4969441bd75c5c2b8d982e2232d2bcbba6b3 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Mon, 6 Dec 2021 09:21:07 -0500 Subject: [PATCH] React to 1.23 bump Logging validation functions changed in upstream commit https://github.com/kubernetes/component-base/commit/54ecfcdac8c92a7f0c88a65a2e9861baa089ac90. This uses the new function name. --- cmd/descheduler/app/options/options.go | 4 ++-- cmd/descheduler/app/server.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/descheduler/app/options/options.go b/cmd/descheduler/app/options/options.go index a04c298ef..64d831c0e 100644 --- a/cmd/descheduler/app/options/options.go +++ b/cmd/descheduler/app/options/options.go @@ -62,9 +62,9 @@ func NewDeschedulerServer() (*DeschedulerServer, error) { } // Validation checks for DeschedulerServer. -func (s *DeschedulerServer) Validate() error { +func (s *DeschedulerServer) ValidateAndApply() error { var errs []error - errs = append(errs, s.Logs.Validate()...) + errs = append(errs, s.Logs.ValidateAndApply()) return utilerrors.NewAggregate(errs) } diff --git a/cmd/descheduler/app/server.go b/cmd/descheduler/app/server.go index 1c8b600e1..c34dc2483 100644 --- a/cmd/descheduler/app/server.go +++ b/cmd/descheduler/app/server.go @@ -49,7 +49,6 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command { Long: `The descheduler evicts pods which may be bound to less desired nodes`, Run: func(cmd *cobra.Command, args []string) { s.Logs.Config.Format = s.Logging.Format - s.Logs.Apply() // LoopbackClientConfig is a config for a privileged loopback connection var LoopbackClientConfig *restclient.Config @@ -59,7 +58,7 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command { return } - if err := s.Validate(); err != nil { + if err := s.ValidateAndApply(); err != nil { klog.ErrorS(err, "failed to validate server configuration") return }