github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41423 from yujuhong/better_logging

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41360, 41423, 41430, 40647, 41352)

kubelet: reduce extraneous logging for pods using host network

For pods using the host network, kubelet/shim should not log
error/warning messages when determining the pod IP address.
This commit is contained in:
Kubernetes Submit Queue 2017-02-15 05:06:08 -08:00 committed by GitHub
commit d47ffa08c7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/dockershim/docker_sandbox.go
View File

@ -178,9 +178,6 @@ func (ds *dockerService) getIPFromPlugin(sandbox *dockertypes.ContainerJSON) (st
return "", err return "", err
} }
msg := fmt.Sprintf("Couldn't find network status for %s/%s through plugin", metadata.Namespace, metadata.Name) msg := fmt.Sprintf("Couldn't find network status for %s/%s through plugin", metadata.Namespace, metadata.Name)
if sharesHostNetwork(sandbox) {
return "", fmt.Errorf("%v: not responsible for host-network sandboxes", msg)
}
cID := kubecontainer.BuildContainerID(runtimeName, sandbox.ID) cID := kubecontainer.BuildContainerID(runtimeName, sandbox.ID)
networkStatus, err := ds.networkPlugin.GetPodNetworkStatus(metadata.Namespace, metadata.Name, cID) networkStatus, err := ds.networkPlugin.GetPodNetworkStatus(metadata.Namespace, metadata.Name, cID)
if err != nil { if err != nil {
@ -202,6 +199,11 @@ func (ds *dockerService) getIP(sandbox *dockertypes.ContainerJSON) (string, erro
if sandbox.NetworkSettings == nil { if sandbox.NetworkSettings == nil {
return "", nil return "", nil
} }
if sharesHostNetwork(sandbox) {
// For sandboxes using host network, the shim is not responsible for
// reporting the IP.
return "", nil
}
if IP, err := ds.getIPFromPlugin(sandbox); err != nil { if IP, err := ds.getIPFromPlugin(sandbox); err != nil {
glog.Warningf("%v", err) glog.Warningf("%v", err)
} else if IP != "" { } else if IP != "" {

4
pkg/kubelet/kuberuntime/kuberuntime_sandbox.go
View File

@ -198,7 +198,9 @@ func (m *kubeGenericRuntimeManager) determinePodSandboxIP(podNamespace, podName
return "" return ""
} }
ip := podSandbox.Network.Ip ip := podSandbox.Network.Ip
if net.ParseIP(ip) == nil { if len(ip) != 0 && net.ParseIP(ip) == nil {
// ip could be an empty string if runtime is not responsible for the
// IP (e.g., host networking).
glog.Warningf("Pod Sandbox reported an unparseable IP %v", ip) glog.Warningf("Pod Sandbox reported an unparseable IP %v", ip)
return "" return ""
} }