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

Merge pull request #15194 from MikaelCluseau/wip-issue-15187

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-16 06:46:20 -07:00
commit 6269e22858
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/dockertools/manager.go
View File

@ -1882,14 +1882,16 @@ func (dm *DockerManager) SyncPod(pod *api.Pod, runningPod kubecontainer.Pod, pod
return err return err
} }
// Setup the host interface (FIXME: move to networkPlugin when ready) // Setup the host interface unless the pod is on the host's network (FIXME: move to networkPlugin when ready)
podInfraContainer, err := dm.client.InspectContainer(string(podInfraContainerID)) podInfraContainer, err := dm.client.InspectContainer(string(podInfraContainerID))
if err != nil { if err != nil {
glog.Errorf("Failed to inspect pod infra container: %v; Skipping pod %q", err, podFullName) glog.Errorf("Failed to inspect pod infra container: %v; Skipping pod %q", err, podFullName)
return err return err
} }
if err = hairpin.SetUpContainer(podInfraContainer.State.Pid, "eth0"); err != nil { if !(pod.Spec.SecurityContext != nil && pod.Spec.SecurityContext.HostNetwork) {
glog.Warningf("Hairpin setup failed for pod %q: %v", podFullName, err) if err = hairpin.SetUpContainer(podInfraContainer.State.Pid, "eth0"); err != nil {
glog.Warningf("Hairpin setup failed for pod %q: %v", podFullName, err)
}
} }
if podDependsOnPodIP(pod) { if podDependsOnPodIP(pod) {
// Find the pod IP after starting the infra container in order to expose // Find the pod IP after starting the infra container in order to expose

2
pkg/kubelet/network/hairpin/hairpin.go
View File

@ -64,7 +64,7 @@ func findPairInterfaceOfContainerInterface(e exec.Interface, containerPid int, c
// Get container's interface index // Get container's interface index
output, err := e.Command(nsenterPath, "-t", fmt.Sprintf("%d", containerPid), "-n", "-F", "--", ethtoolPath, "--statistics", containerInterfaceName).CombinedOutput() output, err := e.Command(nsenterPath, "-t", fmt.Sprintf("%d", containerPid), "-n", "-F", "--", ethtoolPath, "--statistics", containerInterfaceName).CombinedOutput()
if err != nil { if err != nil {
return "", fmt.Errorf("Unable to query interface %s of container %d: %v", containerInterfaceName, containerPid, err) return "", fmt.Errorf("Unable to query interface %s of container %d: %v: %s", containerInterfaceName, containerPid, err, string(output))
} }
// look for peer_ifindex // look for peer_ifindex
match := ethtoolOutputRegex.FindSubmatch(output) match := ethtoolOutputRegex.FindSubmatch(output)