Skip to content

Commit 52c0ed4

Browse files
authored
Merge pull request kubernetes#124342 from zhifei92/fix-error-check
fix error checking in kl.killPod within SyncPod
2 parents fc3abda + f6f0703 commit 52c0ed4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/kubelet/kubelet.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,11 +1851,11 @@ func (kl *Kubelet) SyncPod(ctx context.Context, updateType kubetypes.SyncPodType
18511851
if !pcm.Exists(pod) && !firstSync {
18521852
p := kubecontainer.ConvertPodStatusToRunningPod(kl.getRuntime().Type(), podStatus)
18531853
if err := kl.killPod(ctx, pod, p, nil); err == nil {
1854-
if wait.Interrupted(err) {
1855-
return false, err
1856-
}
18571854
podKilled = true
18581855
} else {
1856+
if wait.Interrupted(err) {
1857+
return false, nil
1858+
}
18591859
klog.ErrorS(err, "KillPod failed", "pod", klog.KObj(pod), "podStatus", podStatus)
18601860
}
18611861
}

0 commit comments

Comments
 (0)