-
Notifications
You must be signed in to change notification settings - Fork 354
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 resource configs #9233
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #9233 +/- ##
==========================================
- Coverage 44.70% 44.70% -0.01%
==========================================
Files 1270 1270
Lines 155172 155186 +14
Branches 2436 2436
==========================================
+ Hits 69366 69370 +4
- Misses 85570 85580 +10
Partials 236 236
Flags with carried forward coverage won't be shown. Click here to find out more.
|
✅ Deploy Preview for determined-ui canceled.
|
eecsliu
added
the
to-cherry-pick
Pull requests that need to be cherry-picked into the current release
label
Apr 23, 2024
salonig23
approved these changes
Apr 24, 2024
carolinaecalderon
approved these changes
Apr 24, 2024
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.
LGTM
jesse-amano-hpe
approved these changes
Apr 24, 2024
eecsliu
force-pushed
the
fix-TCD
branch
6 times, most recently
from
April 24, 2024 06:45
aa7a0ea
to
941e313
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Ticket
DET-10245
Description
Task container defaults weren't being merged properly between cluster level and resource pool level. Instead, cluster level TCDs were being completely overwritten. This changes the logic so that it is actually merging.
Test Plan
Test on both kubernetes and agents if possible.
In this example, we'll demonstrate setting environment variables and log policies.
Start by setting a task container default at the cluster level, such as:
Additionally, set the TCD at the resource pool level:
Lastly, set the same values in your experiment config:
With all three of those set, run devcluster/kubernetes and make sure that in the trial logs you see all of those in the printed config.
Next, comment out each of the three in different combinations to make sure that both the environment variables and the log policies are getting merged correctly. e.g. if there is no log policies in the TCD, the experiment logs should show the cluster level log policies + experiment level log policies.
Checklist
docs/release-notes/
.See Release Note for details.