From f6f07035a88caf08ee98e55b60de2be9d383f395 Mon Sep 17 00:00:00 2001 From: zhifei92 Date: Wed, 17 Apr 2024 10:42:37 +0800 Subject: [PATCH] fix: fix error checking in kl.killPod within SyncPod --- pkg/kubelet/kubelet.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 7c6d614e959..7c3659477bd 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -1863,11 +1863,11 @@ func (kl *Kubelet) SyncPod(ctx context.Context, updateType kubetypes.SyncPodType if !pcm.Exists(pod) && !firstSync { p := kubecontainer.ConvertPodStatusToRunningPod(kl.getRuntime().Type(), podStatus) if err := kl.killPod(ctx, pod, p, nil); err == nil { - if wait.Interrupted(err) { - return false, err - } podKilled = true } else { + if wait.Interrupted(err) { + return false, nil + } klog.ErrorS(err, "KillPod failed", "pod", klog.KObj(pod), "podStatus", podStatus) } }