Merge pull request #124342 from zhifei92/fix-error-check
fix error checking in kl.killPod within SyncPod
This commit is contained in:
		@@ -1851,11 +1851,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)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user