-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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
terrytangyuan
merged 1 commit into
argoproj:main
from
AliyunContainerService:fix/mergebug
Jan 12, 2024
Merged
fix: properly merge envs in configmap and container. Fixes #12424 #12426
terrytangyuan
merged 1 commit into
argoproj:main
from
AliyunContainerService:fix/mergebug
Jan 12, 2024
+92
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shuangkun
force-pushed
the
fix/mergebug
branch
from
December 29, 2023 10:44
6fb9fb0
to
8557ca0
Compare
There was a problem hiding this 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
force-pushed
the
fix/mergebug
branch
from
December 30, 2023 03:45
8557ca0
to
4cdcc3f
Compare
Okay, I have add it. |
shuangkun
force-pushed
the
fix/mergebug
branch
from
December 30, 2023 03:48
4cdcc3f
to
050d41c
Compare
shuangkun
force-pushed
the
fix/mergebug
branch
from
December 30, 2023 04:39
050d41c
to
16a48cb
Compare
…argoproj#12424 Co-authored-by: shuangkun <tsk2013uestc@163.com> Co-authored-by: sherwinkoo29 <sherwinkoo@163.com> Signed-off-by: shuangkun <tsk2013uestc@163.com>
shuangkun
force-pushed
the
fix/mergebug
branch
from
December 30, 2023 04:46
16a48cb
to
25c3ca5
Compare
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
approved these changes
Jan 12, 2024
Thanks! |
5 tasks
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>
This was referenced Oct 19, 2024
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #12424
Motivation
Modifications
Verification