Merge pull request #181 from gthao313/drain-eviction-fix

fix agent stuck on drain bug
bottlerocket-os · Apr 6, 2022 · 4022737 · 4022737
2 parents 327c868 + fbcea3d
commit 4022737
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/models/src/node/drain.rs b/models/src/node/drain.rs
@@ -288,6 +288,12 @@ async fn wait_for_deletion(k8s_client: &kube::Client, pod: &Pod) -> Result<(), e
                 event!(Level::INFO, "Pod {} deleted.", pod.name(),);
                 break;
             }
+
+            Ok(p) if p.uid() != pod.uid() => {
+                event!(Level::INFO, "Pod {} deleted.", p.name(),);
+                break;
+            }
+
             Ok(_) => {
                 event!(
                     Level::DEBUG,