Skip to content

K
k3s
Commit 00882103 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #47197 from derekwaynecarr/fix-message

Automatic merge from submit-queue (batch tested with PRs 46885, 47197) Fix e2e ns deletion message for flake analysis **What this PR does / why we need it**: Let's us know when pods have a missing deletion timestamp. **Special notes for your reviewer**: helps https://github.com/kubernetes/kubernetes/issues/47135
parents 3a96c31d 152def1c
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
test/e2e/framework/util.go
View file @ 00882103
...@@ -997,11 +997,11 @@ func deleteNS(c clientset.Interface, clientPool dynamic.ClientPool, namespace st ...@@ -997,11 +997,11 @@ func deleteNS(c clientset.Interface, clientPool dynamic.ClientPool, namespace st
if remainingContent { if remainingContent {
// pods remain // pods remain
if remainingPods > 0 { if remainingPods > 0 {
// but they were all undergoing deletion (kubelet is probably culprit) if missingTimestamp != 0 {
if missingTimestamp == 0 { // pods remained, but were not undergoing deletion (namespace controller is probably culprit)
return fmt.Errorf("namespace %v was not deleted with limit: %v, pods remaining: %v, pods missing deletion timestamp: %v", namespace, err, remainingPods, missingTimestamp) return fmt.Errorf("namespace %v was not deleted with limit: %v, pods remaining: %v, pods missing deletion timestamp: %v", namespace, err, remainingPods, missingTimestamp)
} }
// pods remained, but were not undergoing deletion (namespace controller is probably culprit) // but they were all undergoing deletion (kubelet is probably culprit, check NodeLost)
return fmt.Errorf("namespace %v was not deleted with limit: %v, pods remaining: %v", namespace, err, remainingPods) return fmt.Errorf("namespace %v was not deleted with limit: %v, pods remaining: %v", namespace, err, remainingPods)
} }
// other content remains (namespace controller is probably screwed up) // other content remains (namespace controller is probably screwed up)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment