From 0cfd09e16160d4f954f810190353a112a0b560ed Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bryan@weave.works>
Date: Thu, 17 Nov 2016 13:53:05 +0000
Subject: [PATCH] Abandon setting hairpin mode if finding the peer interface
 fails

Instead of setting it on every bridge-connected interface which may
have unwanted effects on unrelated things installed on the machine.
---
 pkg/kubelet/network/hairpin/hairpin.go | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkg/kubelet/network/hairpin/hairpin.go b/pkg/kubelet/network/hairpin/hairpin.go
index 1bbcc4969494..f215ec81dbb7 100644
--- a/pkg/kubelet/network/hairpin/hairpin.go
+++ b/pkg/kubelet/network/hairpin/hairpin.go
@@ -58,8 +58,7 @@ func setUpContainerInternal(containerInterfaceName, containerDesc string, nsente
 	e := exec.New()
 	hostIfName, err := findPairInterfaceOfContainerInterface(e, containerInterfaceName, containerDesc, nsenterArgs)
 	if err != nil {
-		glog.Infof("Unable to find pair interface, setting up all interfaces: %v", err)
-		return setUpAllInterfaces()
+		return err
 	}
 	return setUpInterface(hostIfName)
 }
@@ -95,17 +94,6 @@ func findPairInterfaceOfContainerInterface(e exec.Interface, containerInterfaceN
 	return iface.Name, nil
 }
 
-func setUpAllInterfaces() error {
-	interfaces, err := net.Interfaces()
-	if err != nil {
-		return err
-	}
-	for _, netIf := range interfaces {
-		setUpInterface(netIf.Name) // ignore errors
-	}
-	return nil
-}
-
 func setUpInterface(ifName string) error {
 	glog.V(3).Infof("Enabling hairpin on interface %s", ifName)
 	ifPath := path.Join(sysfsNetPath, ifName)