Skip to content

K
k3s
Commit 982640f7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30668 from euank/dockertools-host-network

Automatic merge from submit-queue dockertools: Don't use network plugin if net=host I'm pretty sure this was just an oversight the first time around. Before: `E0815 18:06:17.627468 976 docker_manager.go:350] NetworkPlugin kubenet failed on the status hook for pod 'sleep' - Unexpected command output Device "eth0" does not exist.` After: No such logline is printed The pod IP reported in `describe` is the same either way cc @kubernetes/sig-node
parents b29023aa c94e134a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
pkg/kubelet/dockertools/docker_manager.go
View file @ 982640f7
...@@ -345,7 +345,11 @@ func (dm *DockerManager) determineContainerIP(podNamespace, podName string, cont ...@@ -345,7 +345,11 @@ func (dm *DockerManager) determineContainerIP(podNamespace, podName string, cont
} }
} }
if dm.networkPlugin.Name() != network.DefaultPluginName { networkMode := getDockerNetworkMode(container)
isHostNetwork := networkMode == namespaceModeHost
// For host networking or default network plugin, GetPodNetworkStatus doesn't work
if !isHostNetwork && dm.networkPlugin.Name() != network.DefaultPluginName {
netStatus, err := dm.networkPlugin.GetPodNetworkStatus(podNamespace, podName, kubecontainer.DockerID(container.ID).ContainerID()) netStatus, err := dm.networkPlugin.GetPodNetworkStatus(podNamespace, podName, kubecontainer.DockerID(container.ID).ContainerID())
if err != nil { if err != nil {
glog.Errorf("NetworkPlugin %s failed on the status hook for pod '%s' - %v", dm.networkPlugin.Name(), podName, err) glog.Errorf("NetworkPlugin %s failed on the status hook for pod '%s' - %v", dm.networkPlugin.Name(), podName, err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment