Add annotation for pod template#16772
Merged
georgew5656 merged 4 commits intoapache:masterfrom Jul 23, 2024
Merged
Conversation
kfaraz
reviewed
Jul 22, 2024
Contributor
kfaraz
left a comment
kfaraz
left a comment
There was a problem hiding this comment.
Changes look good, left minor suggestions.
| * @return The pod template that should be used to run the task. | ||
| */ | ||
| @NotNull PodTemplate getPodTemplateForTask(Task task, Map<String, PodTemplate> templates); | ||
| @NotNull Pair<String, PodTemplate> getPodTemplateForTask(Task task, Map<String, PodTemplate> templates); |
Contributor
There was a problem hiding this comment.
For code hygiene and readability, I would advise creating a dedicated class PodTemplateWithKey rather than use a Pair, as pairs are often difficult to interpret.
Also, the javadoc needs to be updated.
| public Pair<String, PodTemplate> getPodTemplateForTask(Task task, Map<String, PodTemplate> templates) | ||
| { | ||
| return templates.getOrDefault(task.getType(), templates.get("base")); | ||
| String templateKey = templates.containsKey(task.getType()) ? task.getType() : "base"; |
Contributor
There was a problem hiding this comment.
Should "base" be kept as a constant somewhere?
| .editTemplate() | ||
| .editOrNewMetadata() | ||
| .addToAnnotations(getPodTemplateAnnotations(task)) | ||
| .addToAnnotations(DruidK8sConstants.TASK_JOB_TEMPLATE, podTemplatePair.lhs) |
Contributor
Author
There was a problem hiding this comment.
one line is adding it to the job spec and one to the pod template spec (which will become the created pod).
Contributor
There was a problem hiding this comment.
Ah, thanks for the clarification, I had missed the editTemplate() invocation.
kfaraz
approved these changes
Jul 23, 2024
Contributor
kfaraz
left a comment
kfaraz
left a comment
There was a problem hiding this comment.
Looks good to me 🚀
Can be merged once CI passes.
sreemanamala
pushed a commit
to sreemanamala/druid
that referenced
this pull request
Aug 6, 2024
* Add annotation for pod template * pr comments * add test cases * add tests
FrankChen021
pushed a commit
that referenced
this pull request
Feb 3, 2025
* Add annotation for pod template * pr comments * add test cases * add tests
GabrielCWT
pushed a commit
to GabrielCWT/druid
that referenced
this pull request
Sep 9, 2025
* Add annotation for pod template * pr comments * add test cases * add tests
RonShub
pushed a commit
to singular-labs/druid
that referenced
this pull request
Oct 19, 2025
* Add annotation for pod template * pr comments * add test cases * add tests
RonShub
pushed a commit
to singular-labs/druid
that referenced
this pull request
Oct 20, 2025
* Add annotation for pod template * pr comments * add test cases * add tests
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Add the template name as a annotation on the pod spec to tell which pods are running which templates in metrics.
Description
It can be useful to group k8s pods launched by mmless ingestion based on the template they used for metrics, logs, etc. To do this we can add the template name as a annotation.
Release note
Key changed/added classes in this PR
PodTemplateTaskAdapterThis PR has: