github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13983 from mikedanese/ds_cleanup

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-15 21:33:47 -07:00
commit 20d74e9fb0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/namespace/namespace_controller.go
View File

@ -196,7 +196,7 @@ func deleteAllContent(kubeClient client.Interface, experimentalMode bool, namesp
if err != nil { if err != nil {
return estimate, err return estimate, err
} }
err = deleteDaemons(kubeClient.Experimental(), namespace) err = deleteDaemonSets(kubeClient.Experimental(), namespace)
if err != nil { if err != nil {
return estimate, err return estimate, err
} }
@ -419,7 +419,7 @@ func deleteHorizontalPodAutoscalers(expClient client.ExperimentalInterface, ns s
return nil return nil
} }
func deleteDaemons(expClient client.ExperimentalInterface, ns string) error { func deleteDaemonSets(expClient client.ExperimentalInterface, ns string) error {
items, err := expClient.DaemonSets(ns).List(labels.Everything()) items, err := expClient.DaemonSets(ns).List(labels.Everything())
if err != nil { if err != nil {
return err return err