|
|
|
@ -233,12 +233,10 @@ func (s *service) start(ctx context.Context) error { |
|
|
|
|
if err := o.Authentication.ApplyTo(&serverConfig.Authentication, serverConfig.SecureServing, serverConfig.OpenAPIConfig); err != nil { |
|
|
|
|
return err |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// override ExternalAddress and LoopbackClientConfig in prod mode.
|
|
|
|
|
// in dev mode we want to use the loopback client config
|
|
|
|
|
// and address provided by SecureServingOptions.
|
|
|
|
|
if !s.config.devMode { |
|
|
|
|
} else { |
|
|
|
|
// In production mode, override ExternalAddress and LoopbackClientConfig.
|
|
|
|
|
// In dev mode we want to use the loopback client config
|
|
|
|
|
// and address provided by SecureServingOptions.
|
|
|
|
|
serverConfig.ExternalAddress = s.config.host |
|
|
|
|
serverConfig.LoopbackClientConfig = &clientrest.Config{ |
|
|
|
|
Host: s.config.apiURL, |
|
|
|
@ -315,23 +313,20 @@ func (s *service) start(ctx context.Context) error { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
s.restConfig = server.LoopbackClientConfig |
|
|
|
|
|
|
|
|
|
// only write kubeconfig in dev mode
|
|
|
|
|
if s.config.devMode { |
|
|
|
|
if err := s.ensureKubeConfig(); err != nil { |
|
|
|
|
return err |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Used by the proxy wrapper registered in ProvideService
|
|
|
|
|
s.handler = server.Handler |
|
|
|
|
s.restConfig = server.LoopbackClientConfig |
|
|
|
|
|
|
|
|
|
// skip starting the server in prod mode
|
|
|
|
|
// When running in production, do not start a standalone https server
|
|
|
|
|
if !s.config.devMode { |
|
|
|
|
return nil |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// only write kubeconfig in dev mode
|
|
|
|
|
if err := s.ensureKubeConfig(); err != nil { |
|
|
|
|
return err |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
prepared := server.PrepareRun() |
|
|
|
|
go func() { |
|
|
|
|
s.stoppedCh <- prepared.Run(s.stopCh) |
|
|
|
|