Merge pull request #19490 from danwinship/hairpin-error

Auto commit by PR queue bot

pkg/kubelet/network/hairpin/hairpin.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net"
+	"os"
 	"path"
 	"regexp"
 	"strconv"
@@ -30,7 +31,8 @@ import (
 
 const (
 	sysfsNetPath            = "/sys/devices/virtual/net"
-	hairpinModeRelativePath = "brport/hairpin_mode"
+	brportRelativePath      = "brport"
+	hairpinModeRelativePath = "hairpin_mode"
 	hairpinEnable           = "1"
 )
 
@@ -95,6 +97,15 @@ func setUpAllInterfaces() error {
 
 func setUpInterface(ifName string) error {
 	glog.V(3).Infof("Enabling hairpin on interface %s", ifName)
-	hairpinModeFile := path.Join(sysfsNetPath, ifName, hairpinModeRelativePath)
+	ifPath := path.Join(sysfsNetPath, ifName)
+	if _, err := os.Stat(ifPath); err != nil {
+		return err
+	}
+	brportPath := path.Join(ifPath, brportRelativePath)
+	if _, err := os.Stat(brportPath); err != nil && os.IsNotExist(err) {
+		// Device is not on a bridge, so doesn't need hairpin mode
+		return nil
+	}
+	hairpinModeFile := path.Join(brportPath, hairpinModeRelativePath)
 	return ioutil.WriteFile(hairpinModeFile, []byte(hairpinEnable), 0644)
 }

pkg/kubelet/network/hairpin/hairpin_test.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"os"
 	"strings"
 	"testing"
 
@@ -84,13 +85,23 @@ func TestFindPairInterfaceOfContainerInterface(t *testing.T) {
 	}
 }
 
-func TestSetUpInterface(t *testing.T) {
+func TestSetUpInterfaceNonExistent(t *testing.T) {
 	err := setUpInterface("non-existent")
 	if err == nil {
 		t.Errorf("unexpected non-error")
 	}
-	hairpinModeFile := fmt.Sprintf("%s/%s/%s", sysfsNetPath, "non-existent", hairpinModeRelativePath)
+	deviceDir := fmt.Sprintf("%s/%s", sysfsNetPath, "non-existent")
-	if !strings.Contains(fmt.Sprintf("%v", err), hairpinModeFile) {
+	if !strings.Contains(fmt.Sprintf("%v", err), deviceDir) {
-		t.Errorf("should have tried to open %s", hairpinModeFile)
+		t.Errorf("should have tried to open %s", deviceDir)
+	}
+}
+
+func TestSetUpInterfaceNotBridged(t *testing.T) {
+	err := setUpInterface("lo")
+	if err != nil {
+		if os.IsNotExist(err) {
+			t.Skipf("'lo' device does not exist??? (%v)", err)
+		}
+		t.Errorf("unexpected error: %v", err)
 	}
 }