github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15831 from zhengguoyong/modify_pod_networkplugin_setup_errmsg

Browse Source 
Modify duplicate err msg
This commit is contained in:
Daniel Smith 2015-10-26 17:07:18 -07:00
commit 3cc2ae4da6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1852,7 +1852,7 @@ func (dm *DockerManager) SyncPod(pod *api.Pod, runningPod kubecontainer.Pod, pod
// Call the networking plugin // Call the networking plugin
err = dm.networkPlugin.SetUpPod(pod.Namespace, pod.Name, podInfraContainerID) err = dm.networkPlugin.SetUpPod(pod.Namespace, pod.Name, podInfraContainerID)
if err != nil { if err != nil {
glog.Errorf("Failed to create pod infra container: %v; Skipping pod %q", err, podFullName) glog.Errorf("Failed to setup networking for pod %q using network plugins: %v; Skipping pod", podFullName, err)
// Delete infra container // Delete infra container
if delErr := dm.KillContainerInPod(kubecontainer.ContainerID{ if delErr := dm.KillContainerInPod(kubecontainer.ContainerID{
ID: string(podInfraContainerID), ID: string(podInfraContainerID),