osd: Merge all osd resources including custom #9658
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
The merging of OSD resource limits and requests assumed that only the cpu and memory resources needed to be merged. It is also possible to set custom resource properties such as intel.com/sriov_net_in: '1' for use with multus, so the merging needs to be more general. Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
subhamkrai
approved these changes
Jan 27, 2022
leseb
approved these changes
Jan 27, 2022
travisn
added a commit
that referenced
this pull request
Jan 27, 2022
osd: Merge all osd resources including custom (backport #9658)
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.
Description of your changes:
The merging of OSD resource limits and requests assumed that only the cpu and memory resources needed to be merged. It is also possible to set custom resource properties such as intel.com/sriov_net_in: '1' for use with multus, so the merging needs to be more general.
Which issue is resolved by this Pull Request:
Resolves #9653
Checklist:
make codegen) has been run to update object specifications, if necessary.