Copy annotations back from RS to Deployment on rollback #23160
Conversation
janetkuo
added
kind/bug
|
Labelling this PR as size/M |
k8s-github-robot
added
the
size/M
|
GCE e2e build/test passed for commit 10539a084dcdc83e5670d94b245811112bc92693. |
| @@ -922,6 +927,21 @@ func copyDeploymentAnnotationsToReplicaSet(deployment *extensions.Deployment, rs | |||
| return rsAnnotationsChanged | |||
| } | |||
|
|
|||
| // copyReplicaSetAnnotationsToDeployment copies RS's annotations to deployment's annotations. | |||
| // This action should be done if and only if the deployment is rolling back to this rs. | |||
| // Note that apply and revision annotations are not copied. | |||
There was a problem hiding this comment.
So the new revision is N+1?
There was a problem hiding this comment.
Revision is only updated (to max old revision + 1, if it's larger) in getNewReplicaSet and then copied to deployment (revision in deployment is for reference only and is always copied from new RS to deployment). We don't touch it here.
|
cc @pwittrock |
|
@pwittrock PTAL. Good time to become familiar with Deployment. :-) |
| // otherwise, the deployment's current annotations (should be the same as current new RS) will be copied to the RS after the rollback. | ||
| // | ||
| // For example, | ||
| // A Deployment has old RS1 with annotation {change-cause:create}, and new RS2 {change-cause:edit}. |
There was a problem hiding this comment.
How are annotations that do not directly override each other handled in this situation? e.g.
{rs1-annotation:foo}
{rs2-annotation:bar}
When we rollback to rs1 from rs2, this will add back {rs1-annotation:foo}, but does {rs2-annotation:bar} need to be explicitly removed (or is that handled by other code?)
There was a problem hiding this comment.
Ah, yes we should remove those annotations.
|
PTAL |
janetkuo
force-pushed
the
rollback-copy-annotation
branch
from
cd95403
to
224eadc
Compare
|
GCE e2e build/test passed for commit cd95403b1b66c4759257efd289e5ff0843bb8826. |
|
GCE e2e build/test passed for commit 224eadc630872a38652210ee6017fbc35b6d825b. |
|
Looks good. Feel free to squash the comments commit. |
janetkuo
force-pushed
the
rollback-copy-annotation
branch
from
224eadc
to
482efba
Compare
|
Squashed and applying tag. Thanks! |
janetkuo
added
the
lgtm
|
GCE e2e build/test passed for commit 482efba. |
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
GCE e2e build/test passed for commit 482efba. |
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
GCE e2e build/test passed for commit 482efba. |
|
Automatic merge from submit-queue |
Auto commit by PR queue bot
bgrant0607
added
the
cherry-pick-approved
…ation Auto commit by PR queue bot (cherry picked from commit edc35bf)
bgrant0607
added
release-note
|
Commit fc63dff found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this s an error find help to get your PR picked. |
…ation Auto commit by PR queue bot (cherry picked from commit edc35bf)
…ation Auto commit by PR queue bot (cherry picked from commit edc35bf)
…ation Auto commit by PR queue bot (cherry picked from commit edc35bf)
…ation Auto commit by PR queue bot (cherry picked from commit edc35bf)
Increase the wait for the service upgrade e2e test for LB Origin-commit: 2d4a4b9f0b15e8e2c164a312a968795da59ea591
Fixes #23087
@bgrant0607 @Kargakis @kubernetes/sig-config