github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only use the resolved name if port was zero

Browse Source
This commit is contained in:
Darren Shepherd
2018-12-31 22:49:42 -07:00
committed by rafaelbreno[commit]
parent f74b3e8c17
commit 29752c9c3d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/kubelet/pkg/cri/streaming/server.go
View File

@@ -241,8 +241,10 @@ func (s *server) Start(stayUp bool) error {
if err != nil { if err != nil {
return err return err
} }
// Use the actual address as baseURL host. This handles the "0" port case. if _, port, err := net.SplitHostPort(s.config.Addr); err != nil || port == "0" {
s.config.BaseURL.Host = listener.Addr().String() // Use the actual address as baseURL host. This handles the "0" port case.
s.config.BaseURL.Host = listener.Addr().String()
}
if s.config.TLSConfig != nil { if s.config.TLSConfig != nil {
return s.server.ServeTLS(listener, "", "") // Use certs from TLSConfig. return s.server.ServeTLS(listener, "", "") // Use certs from TLSConfig.
} }