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: properly merge envs in configmap and container. Fixes #12424 #12426

Merged
merged 1 commit into from
Jan 12, 2024

Conversation

shuangkun
Copy link
Member

@shuangkun shuangkun commented Dec 29, 2023

Fixes #12424

Motivation

Modifications

Verification

Copy link
Member

@terrytangyuan terrytangyuan left a comment

Choose a reason for hiding this comment

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

Could you add a test case?

@shuangkun
Copy link
Member Author

Could you add a test case?

Okay, I have add it.

…argoproj#12424

Co-authored-by: shuangkun <tsk2013uestc@163.com>
Co-authored-by: sherwinkoo29 <sherwinkoo@163.com>
Signed-off-by: shuangkun <tsk2013uestc@163.com>
@juliev0 juliev0 added the prioritized-review For members of the Sustainability Effort label Jan 9, 2024
@terrytangyuan terrytangyuan self-assigned this Jan 12, 2024
@terrytangyuan terrytangyuan changed the title fix: merge env bug in workflow-controller-configmap and container. Fi… fix: merge env bug in workflow-controller-configmap and container. Fixes #12424 Jan 12, 2024
@terrytangyuan terrytangyuan enabled auto-merge (squash) January 12, 2024 16:35
@terrytangyuan
Copy link
Member

Thanks!

@terrytangyuan terrytangyuan merged commit 44b33fa into argoproj:main Jan 12, 2024
31 checks passed
@agilgur5 agilgur5 added the area/controller Controller issues, panics label Jan 14, 2024
isubasinghe pushed a commit to isubasinghe/argo-workflows that referenced this pull request Feb 27, 2024
 argoproj#12424 (argoproj#12426)

Signed-off-by: shuangkun <tsk2013uestc@163.com>
Co-authored-by: sherwinkoo29 <sherwinkoo@163.com>
isubasinghe pushed a commit to isubasinghe/argo-workflows that referenced this pull request Feb 27, 2024
 argoproj#12424 (argoproj#12426)

Signed-off-by: shuangkun <tsk2013uestc@163.com>
Co-authored-by: sherwinkoo29 <sherwinkoo@163.com>
isubasinghe pushed a commit to isubasinghe/argo-workflows that referenced this pull request Feb 27, 2024
 argoproj#12424 (argoproj#12426)

Signed-off-by: shuangkun <tsk2013uestc@163.com>
Co-authored-by: sherwinkoo29 <sherwinkoo@163.com>
isubasinghe pushed a commit to isubasinghe/argo-workflows that referenced this pull request Feb 28, 2024
 argoproj#12424 (argoproj#12426)

Signed-off-by: shuangkun <tsk2013uestc@163.com>
Co-authored-by: sherwinkoo29 <sherwinkoo@163.com>
Signed-off-by: Isitha Subasinghe <isubasinghe@student.unimelb.edu.au>
isubasinghe pushed a commit to isubasinghe/argo-workflows that referenced this pull request Mar 12, 2024
 argoproj#12424 (argoproj#12426)

Signed-off-by: shuangkun <tsk2013uestc@163.com>
Co-authored-by: sherwinkoo29 <sherwinkoo@163.com>
@agilgur5 agilgur5 changed the title fix: merge env bug in workflow-controller-configmap and container. Fixes #12424 fix: properly merge envs in configmap and container. Fixes #12424 Oct 22, 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 prioritized-review For members of the Sustainability Effort
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ENV Merge Bug
4 participants