Skip to content

K
k3s
Commit 6df62ff3 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29162 from xiangpengzhao/fix_err_to_cerr

Automatic merge from submit-queue Fix wrong variable of error Should not log `err` but `cerr`.
parents b7490d5c 2d7dbc22
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/dockertools/docker_manager.go
View file @ 6df62ff3
...@@ -1332,7 +1332,7 @@ func (dm *DockerManager) KillContainerInPod(containerID kubecontainer.ContainerI ...@@ -1332,7 +1332,7 @@ func (dm *DockerManager) KillContainerInPod(containerID kubecontainer.ContainerI
} }
storedPod, storedContainer, cerr := containerAndPodFromLabels(inspect) storedPod, storedContainer, cerr := containerAndPodFromLabels(inspect)
if cerr != nil { if cerr != nil {
glog.Errorf("unable to access pod data from container: %v", err) glog.Errorf("unable to access pod data from container: %v", cerr)
} }
if container == nil { if container == nil {
container = storedContainer container = storedContainer
......
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