From 409dcf10b4d3d9cda71eb6d249ce9594d3f40aa3 Mon Sep 17 00:00:00 2001 From: deads2k Date: Fri, 3 Feb 2017 16:23:49 -0500 Subject: [PATCH] apiserver command line options lead to config --- apiserver/apiserver.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apiserver/apiserver.go b/apiserver/apiserver.go index bb73900a..037d6d13 100644 --- a/apiserver/apiserver.go +++ b/apiserver/apiserver.go @@ -104,14 +104,18 @@ func (serverOptions *ServerRunOptions) Run(stopCh <-chan struct{}) error { // create config from options config := genericapiserver.NewConfig(). - WithSerializer(api.Codecs). - ApplyOptions(serverOptions.GenericServerRunOptions). - ApplyInsecureServingOptions(serverOptions.InsecureServing) + WithSerializer(api.Codecs) - if _, err := config.ApplySecureServingOptions(serverOptions.SecureServing); err != nil { + if err := serverOptions.GenericServerRunOptions.ApplyTo(config); err != nil { + return err + } + if err := serverOptions.InsecureServing.ApplyTo(config); err != nil { + return err + } + if err := serverOptions.SecureServing.ApplyTo(config); err != nil { return fmt.Errorf("failed to configure https: %s", err) } - if err := serverOptions.Authentication.Apply(config); err != nil { + if err := serverOptions.Authentication.ApplyTo(config); err != nil { return fmt.Errorf("failed to configure authentication: %s", err) }