From 59e5bd385c031600f86075beb9d77620f8d7915e Mon Sep 17 00:00:00 2001 From: Alexandre Gaudreault Date: Mon, 12 Aug 2024 13:02:01 -0400 Subject: [PATCH] fix: replicaSet not scaled down due to incorrect annotations (#3762) (#3784) dco Signed-off-by: Alexandre Gaudreault --- rollout/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollout/controller.go b/rollout/controller.go index 23f7f340dd..818c203d87 100644 --- a/rollout/controller.go +++ b/rollout/controller.go @@ -987,7 +987,7 @@ func (c *rolloutContext) updateReplicaSetFallbackToPatch(ctx context.Context, rs } if _, found := rs.Annotations[v1alpha1.DefaultReplicaSetScaleDownDeadlineAnnotationKey]; found { - patchRS.Annotations[v1alpha1.DefaultReplicaSetScaleDownDeadlineAnnotationKey] = rs.Labels[v1alpha1.DefaultReplicaSetScaleDownDeadlineAnnotationKey] + patchRS.Annotations[v1alpha1.DefaultReplicaSetScaleDownDeadlineAnnotationKey] = rs.Annotations[v1alpha1.DefaultReplicaSetScaleDownDeadlineAnnotationKey] } if _, found := rs.Spec.Selector.MatchLabels[v1alpha1.DefaultRolloutUniqueLabelKey]; found {