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

Merge pull request #96441 from smarterclayton/daemonset_surge_impl

Browse Source 
DaemonSet controller respects MaxSurge during update
This commit is contained in:
Kubernetes Prow Robot
2021-03-06 08:23:42 -08:00
committed by GitHub
parent 4770211dad 8d8884a907
commit 377ed3c2a6
7 changed files with 1344 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/v1/pod/util.go
View File

@@ -290,7 +290,7 @@ func IsPodAvailable(pod *v1.Pod, minReadySeconds int32, now metav1.Time) bool {
c := GetPodReadyCondition(pod.Status)
minReadySecondsDuration := time.Duration(minReadySeconds) * time.Second
if minReadySeconds == 0 || !c.LastTransitionTime.IsZero() && c.LastTransitionTime.Add(minReadySecondsDuration).Before(now.Time) {
if minReadySeconds == 0 || (!c.LastTransitionTime.IsZero() && c.LastTransitionTime.Add(minReadySecondsDuration).Before(now.Time)) {
return true
}
return false