Skip to content

fix: Avoid resetting resourceVersion for watch. Fixes #15106#15107

Merged
Joibel merged 1 commit intoargoproj:mainfrom
JackTroy:main
Jan 2, 2026
Merged

fix: Avoid resetting resourceVersion for watch. Fixes #15106#15107
Joibel merged 1 commit intoargoproj:mainfrom
JackTroy:main

Conversation

@JackTroy
Copy link
Contributor

@JackTroy JackTroy commented Dec 5, 2025

Fixes Avoid resetting resourceVersion for watch. Fixes #15106

Modifications

Check resourceVersion before resetting to avoid setting to "" for watch connection

Verification

No repeated error in #15106 after fix.

@Joibel
Copy link
Member

Joibel commented Dec 5, 2025

Interesting, and thank you. Could you sign the DCO so we can merge this?

@Joibel Joibel added cherry-pick/3.6 cherry-pick/3.7 Cherry-pick this to release-3.7 labels Dec 5, 2025
@Joibel
Copy link
Member

Joibel commented Dec 11, 2025

@JackTroy, could you sign the DCO so we can merge this please?

@JackTroy
Copy link
Contributor Author

@Joibel Thank you for noticing. I've done cto and re-pushed my commit

@eduardodbr
Copy link
Member

/retest

@eduardodbr
Copy link
Member

@JackTroy your commit signature and author don't match, so DCO is not accepting it:

Author: jackcui <jackcui@tencent.com>
Date:   Fri Dec 5 11:25:15 2025 +0800

    fix: Avoid resetting resourceVersion for watch. Fixes #15106
    
    Signed-off-by: Jack Cui <jackcui@tencent.com>

Signed-off-by: jackcui <jackcui@tencent.com>
@JackTroy
Copy link
Contributor Author

@eduardodbr Resign by running git rebase HEAD~1 --signoff. Should match this time.

@Joibel
Copy link
Member

Joibel commented Jan 2, 2026

Thanks @JackTroy

@Joibel Joibel merged commit caed4ae into argoproj:main Jan 2, 2026
40 checks passed
argo-cd-cherry-pick-bot bot pushed a commit that referenced this pull request Jan 2, 2026
Signed-off-by: jackcui <jackcui@tencent.com>
argo-cd-cherry-pick-bot bot pushed a commit that referenced this pull request Jan 2, 2026
Signed-off-by: jackcui <jackcui@tencent.com>
@argo-cd-cherry-pick-bot
Copy link

🍒 Cherry-pick PR created for 3.7: #15207

@argo-cd-cherry-pick-bot
Copy link

🍒 Cherry-pick PR created for 3.6: #15206

MasonM pushed a commit to MasonM/argo-workflows that referenced this pull request Jan 20, 2026
…(cherry-pick argoproj#15107 for 3.7) (argoproj#15207)

Signed-off-by: jackcui <jackcui@tencent.com>
Co-authored-by: Jack Cui <691729768@qq.com>
MasonM pushed a commit to MasonM/argo-workflows that referenced this pull request Jan 20, 2026
…(cherry-pick argoproj#15107 for 3.6) (argoproj#15206)

Signed-off-by: jackcui <jackcui@tencent.com>
Co-authored-by: Jack Cui <691729768@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick/3.7 Cherry-pick this to release-3.7

Projects

None yet

Development

Successfully merging this pull request may close these issues.

informer resetting resourceversion to "" leads to watch event missing

3 participants