github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix e2e ns deletion message

Browse Source
This commit is contained in:
Derek Carr 2017-06-08 16:38:50 -04:00
parent 038d194723
commit 152def1cc3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/util.go
View File

@ -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)