Skip to content

Retry object updates on conflict in receiver tests #1352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanprodan merged 1 commit into from
Jul 25, 2026
Merged

Retry object updates on conflict in receiver tests #1352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions internal/controller/receiver_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,16 @@ func TestReceiverReconciler_Reconcile(t *testing.T) {

g.Expect(k8sClient.Delete(context.Background(), secret)).To(Succeed())

g.Expect(k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR)).To(Succeed())

reconcileRequestAt := metav1.Now().String()
resultR.SetAnnotations(map[string]string{
meta.ReconcileRequestAnnotation: reconcileRequestAt,
})
g.Expect(k8sClient.Update(context.Background(), resultR)).To(Succeed())
g.Eventually(func() error {
if err := k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR); err != nil {
return err
}
resultR.SetAnnotations(map[string]string{
meta.ReconcileRequestAnnotation: reconcileRequestAt,
})
return k8sClient.Update(context.Background(), resultR)
}, timeout, time.Second).Should(Succeed())

g.Eventually(func() bool {
_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR)
Expand Down Expand Up @@ -377,13 +380,16 @@ func TestReceiverReconciler_Reconcile(t *testing.T) {
t.Run("handles reconcileAt", func(t *testing.T) {
g := NewWithT(t)

g.Expect(k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR)).To(Succeed())

reconcileRequestAt := metav1.Now().String()
resultR.SetAnnotations(map[string]string{
meta.ReconcileRequestAnnotation: reconcileRequestAt,
})
g.Expect(k8sClient.Update(context.Background(), resultR)).To(Succeed())
g.Eventually(func() error {
if err := k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR); err != nil {
return err
}
resultR.SetAnnotations(map[string]string{
meta.ReconcileRequestAnnotation: reconcileRequestAt,
})
return k8sClient.Update(context.Background(), resultR)
}, timeout, time.Second).Should(Succeed())

g.Eventually(func() bool {
_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR)
Expand All @@ -394,10 +400,13 @@ func TestReceiverReconciler_Reconcile(t *testing.T) {
t.Run("finalizes suspended object", func(t *testing.T) {
g := NewWithT(t)

g.Expect(k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR)).To(Succeed())

resultR.Spec.Suspend = true
g.Expect(k8sClient.Update(context.Background(), resultR)).To(Succeed())
g.Eventually(func() error {
if err := k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR); err != nil {
return err
}
resultR.Spec.Suspend = true
return k8sClient.Update(context.Background(), resultR)
}, timeout, time.Second).Should(Succeed())

g.Eventually(func() bool {
_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR)
Expand Down Expand Up @@ -506,10 +515,13 @@ func TestReceiverReconciler_EventHandler(t *testing.T) {
t.Run("doesn't update the URL on spec updates", func(t *testing.T) {
g := NewWithT(t)

g.Expect(k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR)).To(Succeed())

resultR.Spec.Events = []string{"ping", "push"}
g.Expect(k8sClient.Update(context.Background(), resultR)).To(Succeed())
g.Eventually(func() error {
if err := k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR); err != nil {
return err
}
resultR.Spec.Events = []string{"ping", "push"}
return k8sClient.Update(context.Background(), resultR)
}, timeout, time.Second).Should(Succeed())

g.Eventually(func() bool {
_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(receiver), resultR)
Expand Down