fix: add workflow template level pod annotations and labels to template. Fixes: #12945 #12987
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
tczhao
requested changes
Jun 27, 2024
Comment on lines
141
to
156
| // add workflow template level pod annotations and labels to template | ||
| podMetadata := wftmpl.GetPodMetadata() | ||
| if podMetadata != nil { | ||
| if template.Metadata.Annotations == nil { | ||
| template.Metadata.Annotations = make(map[string]string) | ||
| } | ||
| for k, v := range podMetadata.Annotations { | ||
| template.Metadata.Annotations[k] = v | ||
| } | ||
| if template.Metadata.Labels == nil { | ||
| template.Metadata.Labels = make(map[string]string) | ||
| } | ||
| for k, v := range podMetadata.Labels { | ||
| template.Metadata.Labels[k] = v | ||
| } | ||
| } |
There was a problem hiding this comment.
looks good but I think GetTemplateByName need to have these as well
so that if the template in clusterWorkflowTemplate is a dag template, the podMetadata still applies
shuangkun
force-pushed
the
fix/PodMetadata
branch
from
83aa9d7 to
ae8a11f
Compare
|
add a ut. |
|
/retest |
1 similar comment
|
/retest |
|
@shuangkun The E2E tests are broken due to a bug in Kit. I have a fix for it in #14048. Could you please review that PR? |
Thanks, I was wondering why this test case keeps failing |
shuangkun
force-pushed
the
fix/PodMetadata
branch
from
654a56d to
9d5e131
Compare
…rgoproj#12945 Signed-off-by: shuangkun <[email protected]>
Signed-off-by: shuangkun <[email protected]>
Signed-off-by: shuangkun <[email protected]>
Signed-off-by: shuangkun <[email protected]>
Signed-off-by: shuangkun <[email protected]>
shuangkun
force-pushed
the
fix/PodMetadata
branch
from
9d5e131 to
79008bf
Compare
tczhao
approved these changes
Jan 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #12945
Motivation
add workflow template level pod annotations and labels to template
Modifications
Verification
Local test.