From b214d52628438d52d6f9479889edbae208934e58 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 31 Dec 2018 22:49:42 -0700 Subject: [PATCH] only use the resolved name if port was zero --- staging/src/k8s.io/kubelet/pkg/cri/streaming/server.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/kubelet/pkg/cri/streaming/server.go b/staging/src/k8s.io/kubelet/pkg/cri/streaming/server.go index fe5c22b0497..964145b6ed2 100644 --- a/staging/src/k8s.io/kubelet/pkg/cri/streaming/server.go +++ b/staging/src/k8s.io/kubelet/pkg/cri/streaming/server.go @@ -241,8 +241,10 @@ func (s *server) Start(stayUp bool) error { if err != nil { return err } - // Use the actual address as baseURL host. This handles the "0" port case. - s.config.BaseURL.Host = listener.Addr().String() + if _, port, err := net.SplitHostPort(s.config.Addr); err != nil || port == "0" { + // 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 { return s.server.ServeTLS(listener, "", "") // Use certs from TLSConfig. }