Merge pull request kubernetes#77208 from DaiHao/daemon_controller

k8s-ci-robot · web-flow · commit e871241268c4 · 2019-05-03T21:01:52.000-07:00
Fix rolling update daemonset bug in clock-skew scenario
diff --git a/pkg/controller/daemon/daemon_controller.go b/pkg/controller/daemon/daemon_controller.go
@@ -1198,6 +1198,10 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *apps.DaemonSet, nodeL
 		return fmt.Errorf("error storing status for daemon set %#v: %v", ds, err)
 	}
 
+	// Resync the DaemonSet after MinReadySeconds as a last line of defense to guard against clock-skew.
+	if ds.Spec.MinReadySeconds > 0 && numberReady != numberAvailable {
+		dsc.enqueueDaemonSetAfter(ds, time.Duration(ds.Spec.MinReadySeconds)*time.Second)
+	}
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1198,6 +1198,10 @@ func (dsc DaemonSetsController) updateDaemonSetStatus(ds apps.DaemonSet, nodeL`
`1198`	`1198`	`return fmt.Errorf("error storing status for daemon set %#v: %v", ds, err)`
`1199`	`1199`	`}`
`1200`	`1200`
	`1201`	`+ // Resync the DaemonSet after MinReadySeconds as a last line of defense to guard against clock-skew.`
	`1202`	`+ if ds.Spec.MinReadySeconds > 0 && numberReady != numberAvailable {`
	`1203`	`+ dsc.enqueueDaemonSetAfter(ds, time.Duration(ds.Spec.MinReadySeconds)*time.Second)`
	`1204`	`+ }`
`1201`	`1205`	`return nil`
`1202`	`1206`	`}`
`1203`	`1207`