Skip to content

K
k3s
Unverified Commit e8712412 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #77208 from DaiHao/daemon_controller

Fix rolling update daemonset bug in clock-skew scenario
parents e1fa1954 18ed2f6c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
pkg/controller/daemon/daemon_controller.go
View file @ e8712412
...@@ -1198,6 +1198,10 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *apps.DaemonSet, nodeL ...@@ -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) 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 return nil
} }
......
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