Skip to content
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.

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

fix: mark task result completed use nodeId instead of podname. Fixes #12733 #12755

Merged
merged 1 commit into from
Mar 12, 2024

Conversation

shuangkun
Copy link
Member

@shuangkun shuangkun commented Mar 7, 2024

Fixes #12733
mark task result completed use nodeId instead of podname

Motivation

Modifications

Verification

Signed-off-by: shuangkun <tsk2013uestc@163.com>
@shuangkun shuangkun changed the title fix: mark task result completed use nodeId instead of podname fix: mark task result completed use nodeId instead of podname. Fixes: #12733 Mar 7, 2024
@agilgur5 agilgur5 added area/controller Controller issues, panics type/backport Backport of an existing PR to an older release branch labels Mar 7, 2024
@agilgur5
Copy link
Member

Fixes: #12733

For context, see the root cause analysis in #12733 (comment) and above. A merge conflict in 3.5.5 was incorrectly resolved; this PR fixes that to the correct resolution (note that this PR is to the release-3.5 branch specifically)

Copy link
Member

@agilgur5 agilgur5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for tracking this down and fixing it!

As this is a backport PR, going to merge this in cleanly as-is, but a regression test for this would be good to have per #12733 (comment)

@agilgur5 agilgur5 merged commit d95791f into argoproj:release-3.5 Mar 12, 2024
11 checks passed
@agilgur5 agilgur5 changed the title fix: mark task result completed use nodeId instead of podname. Fixes: #12733 fix: mark task result completed use nodeId instead of podname. Fixes #12733 Mar 12, 2024
@agilgur5 agilgur5 linked an issue Mar 12, 2024 that may be closed by this pull request
4 tasks
@tczhao
Copy link
Member

tczhao commented Mar 13, 2024

I wonder if we are planning to do a 3.5.6 release to include this fix?

@agilgur5
Copy link
Member

Yea it'll be released with 3.5.6 -- the release-3.5 branch is where all 3.5.x releases tag off. Also was briefly discussed on Slack

@agilgur5 agilgur5 added this to the v3.5.x patches milestone Apr 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/controller Controller issues, panics type/backport Backport of an existing PR to an older release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Workflow does not complete even though Pod completed in 3.5.5
3 participants