Skip to content

K
k3s
Commit 3cc2ae4d authored by Daniel Smith's avatar Daniel Smith
Browse files
Options

Merge pull request #15831 from zhengguoyong/modify_pod_networkplugin_setup_errmsg

Modify duplicate err msg
parents 075d760a af355df9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/dockertools/manager.go
View file @ 3cc2ae4d
...@@ -1852,7 +1852,7 @@ func (dm *DockerManager) SyncPod(pod *api.Pod, runningPod kubecontainer.Pod, pod ...@@ -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),
......
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