From 6c13a02026e47849a477158a4f209291fb899467 Mon Sep 17 00:00:00 2001 From: better88 Date: Fri, 17 Mar 2017 23:23:41 +0800 Subject: [PATCH] Fix revision when SetDeploymentRevision --- pkg/controller/deployment/deployment_controller_test.go | 4 +--- pkg/controller/deployment/sync.go | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 7e2638b8563..d075ad86b84 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -287,9 +287,7 @@ func TestReentrantRollback(t *testing.T) { d := newDeployment("foo", 1, nil, nil, nil, map[string]string{"foo": "bar"}) d.Spec.RollbackTo = &extensions.RollbackConfig{Revision: 0} - // TODO: This is 1 for now until FindOldReplicaSets gets fixed. - // See https://github.com/kubernetes/kubernetes/issues/42570. - d.Annotations = map[string]string{util.RevisionAnnotation: "1"} + d.Annotations = map[string]string{util.RevisionAnnotation: "2"} f.dLister = append(f.dLister, d) rs1 := newReplicaSet(d, "deploymentrs-old", 0) diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index 4f725d84e4a..072629ec63f 100644 --- a/pkg/controller/deployment/sync.go +++ b/pkg/controller/deployment/sync.go @@ -259,7 +259,8 @@ func (dc *DeploymentController) getNewReplicaSet(deployment *extensions.Deployme return dc.client.Extensions().ReplicaSets(rsCopy.ObjectMeta.Namespace).Update(rsCopy) } - updateConditions := deploymentutil.SetDeploymentRevision(deployment, newRevision) + // Should use the revision in existingNewRS's annotation, since it set by before + updateConditions := deploymentutil.SetDeploymentRevision(deployment, rsCopy.Annotations[deploymentutil.RevisionAnnotation]) // If no other Progressing condition has been recorded and we need to estimate the progress // of this deployment then it is likely that old users started caring about progress. In that // case we need to take into account the first time we noticed their new replica set.