Merge pull request #48339 from dixudx/dont_recreate_static_pod_when_node_deleted

Automatic merge from submit-queue (batch tested with PRs 53135, 52512, 48339). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. don't recreate a mirror pod for static pod when node gets deleted **What this PR does / why we need it**: Currently `kubelet` will try to recreate a mirror pod for static pod when node gets deleted. **Which issue this PR fixes** : fixes #48213 **Special notes for your reviewer**: **Release note**: ```release-note don't recreate a mirror pod for static pod when node gets deleted ```

Merge pull request #48339 from dixudx/dont_recreate_static_pod_when_node_deleted
5f64769b · Kubernetes Submit Queue · GitHub · 413cf643 · 32199cb9 · 5f64769b
Commit 5f64769b authored Oct 03, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

kubelet.go pkg/kubelet/kubelet.go +8 -3

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1597,9 +1597,14 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
 			}
 		}
 		if mirrorPod == nil || deleted {
-			glog.V(3).Infof("Creating a mirror pod for static pod %q", format.Pod(pod))
+			node, err := kl.GetNode()
-			if err := kl.podManager.CreateMirrorPod(pod); err != nil {
+			if err != nil || node.DeletionTimestamp != nil {
-				glog.Errorf("Failed creating a mirror pod for %q: %v", format.Pod(pod), err)
+				glog.V(4).Infof("No need to create a mirror pod, since node %q has been removed from the cluster", kl.nodeName)
+			} else {
+				glog.V(4).Infof("Creating a mirror pod for static pod %q", format.Pod(pod))
+				if err := kl.podManager.CreateMirrorPod(pod); err != nil {
+					glog.Errorf("Failed creating a mirror pod for %q: %v", format.Pod(pod), err)
+				}
 			}
 		}
 	}