Commit 81c1e0c6 authored by Janet Kuo's avatar Janet Kuo

Address comments

parent 634b6955
...@@ -563,9 +563,9 @@ func (dsc *DaemonSetsController) manage(ds *extensions.DaemonSet) error { ...@@ -563,9 +563,9 @@ func (dsc *DaemonSetsController) manage(ds *extensions.DaemonSet) error {
for err := range errCh { for err := range errCh {
errors = append(errors, err) errors = append(errors, err)
} }
// Throw an error when the daemon pods fail, to use ratelimiter to prevent kill-recreate hot loop
if failedPodsObserved > 0 { if failedPodsObserved > 0 {
// Throw an error when the daemon pods fail to prevent kill-recreate hot loop errors = append(errors, fmt.Errorf("deleted %d failed pods of DaemonSet %s/%s", failedPodsObserved, ds.Namespace, ds.Name))
errors = append(errors, fmt.Errorf("Deleted %d failed pods", failedPodsObserved))
} }
return utilerrors.NewAggregate(errors) return utilerrors.NewAggregate(errors)
} }
......
...@@ -661,7 +661,7 @@ func TestObservedGeneration(t *testing.T) { ...@@ -661,7 +661,7 @@ func TestObservedGeneration(t *testing.T) {
} }
} }
// DaemonSet controller should kill all failed pods and recreate at most 1 failed pod. // DaemonSet controller should kill all failed pods and create at most 1 pod on every node.
func TestDaemonKillFailedPods(t *testing.T) { func TestDaemonKillFailedPods(t *testing.T) {
tests := []struct { tests := []struct {
numFailedPods, numNormalPods, expectedCreates, expectedDeletes int numFailedPods, numNormalPods, expectedCreates, expectedDeletes int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment