Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
152def1c
Commit
152def1c
authored
Jun 08, 2017
by
Derek Carr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix e2e ns deletion message
parent
038d1947
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
util.go
test/e2e/framework/util.go
+3
-3
No files found.
test/e2e/framework/util.go
View file @
152def1c
...
@@ -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 culpri
t)
//
but they were all undergoing deletion (kubelet is probably culprit, check NodeLos
t)
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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment