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

Merge pull request #52127 from kargakis/do-not-report-timeout

Browse Source 
Automatic merge from submit-queue

Fix deployment timeout reporting

If the previous condition has been a successful rollout then we
shouldn't try to estimate any progress. Scenario:

* progressDeadlineSeconds is smaller than the difference between
  now and the time the last rollout finished in the past.
* the creation of a new ReplicaSet triggers a resync of the
  Deployment prior to the cached copy of the Deployment getting
  updated with the status.condition that indicates the creation
   of the new ReplicaSet.

The Deployment will be resynced and eventually its Progressing
condition will catch up with the state of the world.

Fixes https://github.com/kubernetes/kubernetes/issues/49637

I will also cherry-pick this back to 1.7.

**Release note**:

```NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-08 10:39:31 -07:00 committed by GitHub
commit 629fea3ef6
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/controller/deployment/util/deployment_util.go
View File

@ -861,6 +861,20 @@ func DeploymentTimedOut(deployment *extensions.Deployment, newStatus *extensions
if condition == nil { if condition == nil {
return false return false
} }
// If the previous condition has been a successful rollout then we shouldn't try to
// estimate any progress. Scenario:
//
// * progressDeadlineSeconds is smaller than the difference between now and the time
// the last rollout finished in the past.
// * the creation of a new ReplicaSet triggers a resync of the Deployment prior to the
// cached copy of the Deployment getting updated with the status.condition that indicates
// the creation of the new ReplicaSet.
//
// The Deployment will be resynced and eventually its Progressing condition will catch
// up with the state of the world.
if condition.Reason == NewRSAvailableReason {
return false
}
if condition.Reason == TimedOutReason { if condition.Reason == TimedOutReason {
return true return true
} }

15
pkg/controller/deployment/util/deployment_util_test.go
View File

@ -1127,7 +1127,7 @@ func TestDeploymentTimedOut(t *testing.T) {
timeFn := func(min, sec int) time.Time { timeFn := func(min, sec int) time.Time {
return time.Date(2016, 1, 1, 0, min, sec, 0, time.UTC) return time.Date(2016, 1, 1, 0, min, sec, 0, time.UTC)
} }
deployment := func(condType extensions.DeploymentConditionType, status v1.ConditionStatus, pds *int32, from time.Time) extensions.Deployment { deployment := func(condType extensions.DeploymentConditionType, status v1.ConditionStatus, reason string, pds *int32, from time.Time) extensions.Deployment {
return extensions.Deployment{ return extensions.Deployment{
Spec: extensions.DeploymentSpec{ Spec: extensions.DeploymentSpec{
ProgressDeadlineSeconds: pds, ProgressDeadlineSeconds: pds,
@ -1137,6 +1137,7 @@ func TestDeploymentTimedOut(t *testing.T) {
{ {
Type: condType, Type: condType,
Status: status, Status: status,
Reason: reason,
LastUpdateTime: metav1.Time{Time: from}, LastUpdateTime: metav1.Time{Time: from},
}, },
}, },
@ -1155,24 +1156,30 @@ func TestDeploymentTimedOut(t *testing.T) {
{ {
name: "no progressDeadlineSeconds specified - no timeout", name: "no progressDeadlineSeconds specified - no timeout",
d: deployment(extensions.DeploymentProgressing, v1.ConditionTrue, null, timeFn(1, 9)), d: deployment(extensions.DeploymentProgressing, v1.ConditionTrue, "", null, timeFn(1, 9)),
nowFn: func() time.Time { return timeFn(1, 20) }, nowFn: func() time.Time { return timeFn(1, 20) },
expected: false, expected: false,
}, },
{ {
name: "progressDeadlineSeconds: 10s, now - started => 00:01:20 - 00:01:09 => 11s", name: "progressDeadlineSeconds: 10s, now - started => 00:01:20 - 00:01:09 => 11s",
d: deployment(extensions.DeploymentProgressing, v1.ConditionTrue, &ten, timeFn(1, 9)), d: deployment(extensions.DeploymentProgressing, v1.ConditionTrue, "", &ten, timeFn(1, 9)),
nowFn: func() time.Time { return timeFn(1, 20) }, nowFn: func() time.Time { return timeFn(1, 20) },
expected: true, expected: true,
}, },
{ {
name: "progressDeadlineSeconds: 10s, now - started => 00:01:20 - 00:01:11 => 9s", name: "progressDeadlineSeconds: 10s, now - started => 00:01:20 - 00:01:11 => 9s",
d: deployment(extensions.DeploymentProgressing, v1.ConditionTrue, &ten, timeFn(1, 11)), d: deployment(extensions.DeploymentProgressing, v1.ConditionTrue, "", &ten, timeFn(1, 11)),
nowFn: func() time.Time { return timeFn(1, 20) }, nowFn: func() time.Time { return timeFn(1, 20) },
expected: false, expected: false,
}, },
{
name: "previous status was a complete deployment",
d: deployment(extensions.DeploymentProgressing, v1.ConditionTrue, NewRSAvailableReason, nil, time.Time{}),
expected: false,
},
} }
for _, test := range tests { for _, test := range tests {