github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13700 from mikedanese/daemon_set

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-10 10:15:45 -07:00
parent 92f21b3fe3 bf881f187e
commit 1313e3b14e
28 changed files with 562 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,12 +419,12 @@ func deleteHorizontalPodAutoscalers(expClient client.ExperimentalInterface, ns s
}
func deleteDaemons(expClient client.ExperimentalInterface, ns string) error {
items, err := expClient.Daemons(ns).List(labels.Everything())
items, err := expClient.DaemonSets(ns).List(labels.Everything())
if err != nil {
return err
}
for i := range items.Items {
err := expClient.Daemons(ns).Delete(items.Items[i].Name)
err := expClient.DaemonSets(ns).Delete(items.Items[i].Name)
if err != nil && !errors.IsNotFound(err) {
return err
}

2
pkg/controller/namespace/namespace_controller_test.go
View File

@@ -107,7 +107,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, experimentalMode bool) {
if experimentalMode {
expectedActionSet.Insert(
strings.Join([]string{"list", "horizontalpodautoscalers", ""}, "-"),
strings.Join([]string{"list", "daemons", ""}, "-"),
strings.Join([]string{"list", "daemonsets", ""}, "-"),
strings.Join([]string{"list", "deployments", ""}, "-"),
)
}