Propagate additional annotations to pods #3379
Merged
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
zuqq
commented
Feb 7, 2024
Comment on lines
-545
to
-548
| additionalAnnotations, found := additionalAnnotationsByJobId[job.Id()] | ||
| if !found { | ||
| additionalAnnotations = make(map[string]string) | ||
| } |
There was a problem hiding this comment.
It's fine for additionalAnnotations to be nil (we only read from it here), so I've removed this check.
Comment on lines
-305
to
-306
| // Additional annotations to be added to the PodSpec. | ||
| map<string, string> additional_annotations = 8; |
There was a problem hiding this comment.
We haven't started consuming this field yet, so removing it won't break anything; I'm storing additional annotations in pod_requirements_overlay instead, which already has a column in the scheduler database.
severinson
approved these changes
Feb 7, 2024
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.
The main change here is that
LeaseJobRunsnow adds the additional annotations toJobRunLease(viaPodRequirementsOverlay, which already has a column in the scheduler database); these are already consumed byCreatePodFromExecutorApiJob, so I'm hopeful that this PR is already enough to get this working end to end:armada/internal/executor/util/kubernetes_object.go
Lines 259 to 262 in 0c48390