Merge pull request #44636 from yvespp/master

Automatic merge from submit-queue client-go PortForwarder: don't log an error if net.Listen fails **What this PR does / why we need it**: If ipv6 is disabled the client-go PortForwarder logs an error: ``` E0406 17:26:06.983609 29625 portforward.go:209] Unable to create listener: Error listen tcp6 [::1]:30143: socket: address family not supported by protocol ``` This pull request removes this error log. Reasons: * Tunnel creation might still succeed on ipv4 and the error just confuses the user (see https://github.com/kubernetes/helm/issues/2223). * If the tunnel can't be created the error gets also loggen in `listenOnPort`. * runtime.HandleError should only be used on errors "_when a non-user facing piece of code cannot return an error"_ which isn't the case here. **Which issue this PR fixes** Fixes https://github.com/kubernetes/helm/issues/2223

Merge pull request #44636 from yvespp/master
c4bc7c11 · Kubernetes Submit Queue · GitHub · 3559c067 · 99711a96 · c4bc7c11
Commit c4bc7c11 authored Apr 21, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

portforward.go ...ing/src/k8s.io/client-go/tools/portforward/portforward.go +1 -2

No files found.
--- a/staging/src/k8s.io/client-go/tools/portforward/portforward.go
+++ b/staging/src/k8s.io/client-go/tools/portforward/portforward.go
@@ -209,8 +209,7 @@ func (pf *PortForwarder) listenOnPortAndAddress(port *ForwardedPort, protocol st
 func (pf *PortForwarder) getListener(protocol string, hostname string, port *ForwardedPort) (net.Listener, error) {
 	listener, err := net.Listen(protocol, fmt.Sprintf("%s:%d", hostname, port.Local))
 	if err != nil {
-		runtime.HandleError(fmt.Errorf("Unable to create listener: Error %s", err))
-		return nil, err
+		return nil, fmt.Errorf("Unable to create listener: Error %s", err)
 	}
 	listenerAddress := listener.Addr().String()
 	host, localPort, _ := net.SplitHostPort(listenerAddress)