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
4f24ea65
Commit
4f24ea65
authored
Feb 11, 2016
by
mqliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete replicaset when delete namespace
parent
62e57434
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
namespace_controller_test.go
pkg/controller/namespace/namespace_controller_test.go
+2
-1
namespace_controller_utils.go
pkg/controller/namespace/namespace_controller_utils.go
+10
-0
No files found.
pkg/controller/namespace/namespace_controller_test.go
View file @
4f24ea65
...
...
@@ -120,6 +120,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *unversioned.APIV
pendingActionSet
.
Insert
(
strings
.
Join
([]
string
{
"delete-collection"
,
"daemonsets"
,
""
},
"-"
),
strings
.
Join
([]
string
{
"delete-collection"
,
"deployments"
,
""
},
"-"
),
strings
.
Join
([]
string
{
"delete-collection"
,
"replicasets"
,
""
},
"-"
),
strings
.
Join
([]
string
{
"delete-collection"
,
"jobs"
,
""
},
"-"
),
strings
.
Join
([]
string
{
"delete-collection"
,
"horizontalpodautoscalers"
,
""
},
"-"
),
strings
.
Join
([]
string
{
"delete-collection"
,
"ingresses"
,
""
},
"-"
),
...
...
@@ -148,7 +149,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *unversioned.APIV
mockClient
:=
fake
.
NewSimpleClientset
(
testInput
.
testNamespace
)
if
containsVersion
(
versions
,
"extensions/v1beta1"
)
{
resources
:=
[]
unversioned
.
APIResource
{}
for
_
,
resource
:=
range
[]
string
{
"daemonsets"
,
"deployments"
,
"jobs"
,
"horizontalpodautoscalers"
,
"ingresses"
}
{
for
_
,
resource
:=
range
[]
string
{
"daemonsets"
,
"deployments"
,
"
replicasets"
,
"
jobs"
,
"horizontalpodautoscalers"
,
"ingresses"
}
{
resources
=
append
(
resources
,
unversioned
.
APIResource
{
Name
:
resource
})
}
mockClient
.
Resources
=
map
[
string
]
*
unversioned
.
APIResourceList
{
...
...
pkg/controller/namespace/namespace_controller_utils.go
View file @
4f24ea65
...
...
@@ -184,6 +184,12 @@ func deleteAllContent(kubeClient clientset.Interface, versions *unversioned.APIV
return
estimate
,
err
}
}
if
containsResource
(
resources
,
"replicasets"
)
{
err
=
deleteReplicaSets
(
kubeClient
.
Extensions
(),
namespace
)
if
err
!=
nil
{
return
estimate
,
err
}
}
}
return
estimate
,
nil
}
...
...
@@ -343,6 +349,10 @@ func deleteDeployments(expClient extensions_unversioned.ExtensionsInterface, ns
return
expClient
.
Deployments
(
ns
)
.
DeleteCollection
(
nil
,
api
.
ListOptions
{})
}
func
deleteReplicaSets
(
expClient
extensions_unversioned
.
ExtensionsInterface
,
ns
string
)
error
{
return
expClient
.
ReplicaSets
(
ns
)
.
DeleteCollection
(
nil
,
api
.
ListOptions
{})
}
func
deleteIngress
(
expClient
extensions_unversioned
.
ExtensionsInterface
,
ns
string
)
error
{
return
expClient
.
Ingresses
(
ns
)
.
DeleteCollection
(
nil
,
api
.
ListOptions
{})
}
...
...
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