fix: set resource version for subscription in sequence reconciler (#8180)

Cali0707 · web-flow · commit 865f1449cadd · 2024-08-26T16:57:35.000Z
Signed-off-by: Cali0707 &lt;calumramurray@gmail.com&gt;
diff --git a/pkg/reconciler/sequence/sequence.go b/pkg/reconciler/sequence/sequence.go
@@ -219,6 +219,7 @@ func (r *Reconciler) reconcileSubscription(ctx context.Context, step int, p *v1.
 		}
 		return newSub, nil
 	} else if equal, err := kmp.SafeEqual(sub.Spec, expected.Spec); !equal || err != nil {
+		expected.ResourceVersion = sub.ResourceVersion
 		// only the mutable fields were changed, so we can update the subscription
 		updatedSub, err := r.eventingClientSet.MessagingV1().Subscriptions(sub.Namespace).Update(ctx, expected, metav1.UpdateOptions{})
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,7 @@ func (r Reconciler) reconcileSubscription(ctx context.Context, step int, p v1.`
`219`	`219`	`}`
`220`	`220`	`return newSub, nil`
`221`	`221`	`} else if equal, err := kmp.SafeEqual(sub.Spec, expected.Spec); !equal \|\| err != nil {`
	`222`	`+ expected.ResourceVersion = sub.ResourceVersion`
`222`	`223`	`// only the mutable fields were changed, so we can update the subscription`
`223`	`224`	`updatedSub, err := r.eventingClientSet.MessagingV1().Subscriptions(sub.Namespace).Update(ctx, expected, metav1.UpdateOptions{})`
`224`	`225`	`if err != nil {`