From e24c7d58d3b26a93291cc2af47cf90a4665d5dd4 Mon Sep 17 00:00:00 2001 From: deads2k Date: Wed, 7 Jun 2017 13:24:27 -0400 Subject: [PATCH] react to moving insecure options --- pkg/cmd/server/kubernetes/master/master_config.go | 6 +++--- pkg/cmd/server/origin/master.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/cmd/server/kubernetes/master/master_config.go b/pkg/cmd/server/kubernetes/master/master_config.go index ae669d5f9160..d6f233f37b7d 100644 --- a/pkg/cmd/server/kubernetes/master/master_config.go +++ b/pkg/cmd/server/kubernetes/master/master_config.go @@ -124,7 +124,7 @@ func BuildKubeAPIserverOptions(masterConfig configapi.MasterConfig) (*kapiserver server.Features.EnableProfiling = true server.MasterCount = masterConfig.KubernetesMasterConfig.MasterCount - server.SecureServing.ServingOptions.BindPort = port + server.SecureServing.BindPort = port server.SecureServing.ServerCert.CertKey.CertFile = masterConfig.ServingInfo.ServerCert.CertFile server.SecureServing.ServerCert.CertKey.KeyFile = masterConfig.ServingInfo.ServerCert.KeyFile server.InsecureServing.BindPort = 0 @@ -222,7 +222,7 @@ func BuildStorageFactory(masterConfig configapi.MasterConfig, server *kapiserver // ONLY COMMENT OUT CODE HERE, do not modify it. Do modifications outside of this function. func buildUpstreamGenericConfig(s *kapiserveroptions.ServerRunOptions) (*apiserver.Config, error) { // set defaults - if err := s.GenericServerRunOptions.DefaultAdvertiseAddress(s.SecureServing, s.InsecureServing); err != nil { + if err := s.GenericServerRunOptions.DefaultAdvertiseAddress(s.SecureServing); err != nil { return nil, err } // In origin: certs should be available: @@ -256,7 +256,7 @@ func buildUpstreamGenericConfig(s *kapiserveroptions.ServerRunOptions) (*apiserv if err := s.SecureServing.ApplyTo(genericConfig); err != nil { return nil, err } - if err := s.InsecureServing.ApplyTo(genericConfig); err != nil { + if _, err := s.InsecureServing.ApplyTo(genericConfig); err != nil { return nil, err } if err := s.Audit.ApplyTo(genericConfig); err != nil { diff --git a/pkg/cmd/server/origin/master.go b/pkg/cmd/server/origin/master.go index d62afed8490f..8e73e51b8624 100644 --- a/pkg/cmd/server/origin/master.go +++ b/pkg/cmd/server/origin/master.go @@ -177,7 +177,7 @@ func (c *MasterConfig) Run(kc *kubernetes.MasterConfig, assetConfig *AssetConfig messages []string err error ) - kc.Master.GenericConfig.BuildHandlerChainsFunc, messages, err = c.buildHandlerChain(assetConfig) + kc.Master.GenericConfig.BuildHandlerChainFunc, messages, err = c.buildHandlerChain(assetConfig) if err != nil { glog.Fatalf("Failed to launch master: %v", err) } @@ -251,7 +251,7 @@ func (c *MasterConfig) kubernetesAPIMessages(kc *kubernetes.MasterConfig) []stri return messages } -func (c *MasterConfig) buildHandlerChain(assetConfig *AssetConfig) (func(http.Handler, *apiserver.Config) (secure, insecure http.Handler), []string, error) { +func (c *MasterConfig) buildHandlerChain(assetConfig *AssetConfig) (func(http.Handler, *apiserver.Config) (secure http.Handler), []string, error) { var messages []string if c.Options.OAuthConfig != nil { messages = append(messages, fmt.Sprintf("Started OAuth2 API at %%s%s", OpenShiftOAuthAPIPrefix)) @@ -266,7 +266,7 @@ func (c *MasterConfig) buildHandlerChain(assetConfig *AssetConfig) (func(http.Ha } // TODO(sttts): resync with upstream handler chain and re-use upstream filters as much as possible - return func(apiHandler http.Handler, kc *apiserver.Config) (secure, insecure http.Handler) { + return func(apiHandler http.Handler, kc *apiserver.Config) (secure http.Handler) { contextMapper := c.getRequestContextMapper() handler := c.versionSkewFilter(apiHandler, contextMapper) @@ -326,7 +326,7 @@ func (c *MasterConfig) buildHandlerChain(assetConfig *AssetConfig) (func(http.Ha handler = apifilters.WithRequestInfo(handler, apiserver.NewRequestInfoResolver(kc), contextMapper) handler = apirequest.WithRequestContext(handler, contextMapper) - return handler, nil + return handler }, messages, nil }