feat: Display resource managers information #8951
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
✅ Deploy Preview for determined-ui ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #8951 +/- ##
==========================================
- Coverage 48.55% 42.33% -6.23%
==========================================
Files 749 429 -320
Lines 136692 97360 -39332
Branches 2237 2237
==========================================
- Hits 66374 41214 -25160
+ Misses 70160 55988 -14172
Partials 158 158
Flags with carried forward coverage won't be shown. Click here to find out more.
|
ashtonG
reviewed
Mar 6, 2024
webui/react/src/stores/cluster.tsx
Outdated
| @@ -183,6 +186,9 @@ class ClusterStore extends PollingStore { | |||
| getResourcePools({}, { signal: signal ?? canceler.signal }) | |||
| .then((response) => { | |||
| this.#resourcePools.set(Loaded(response)); | |||
| this.#multiResourceManagers.set( | |||
| Loaded(uniq(response.map((p) => p.resourceManagerName)).length > 1), | |||
There was a problem hiding this comment.
this is derived from the resourcePools part of the response -- expose this info as a selection instead. Furthermore, uniq is unnecessary -- just put it in a set and get the resulting size:
public readonly multiResourceManagers = this.#resourcePools.select((resourcePools) =>
Loadable.map(resourcePools, (r) => new Set(r.map((p) => p.resourceManagerName)).length > 1))
ashtonG
reviewed
Mar 6, 2024
| @@ -141,9 +143,12 @@ const ResourcePoolCard: React.FC<Props> = ({ | |||
| if (pool.type === V1ResourcePoolType.K8S && attribute.key !== 'type') { | |||
| delete acc[attribute.label]; | |||
| } | |||
| if (attribute.key === 'resourceManagerName' && !multiResourceManagers.getOrElse(false)) { | |||
There was a problem hiding this comment.
merge this with the previous if statement, please:
if ((pool.type === V1ResourcePoolType.K8S && attribute.key !== 'type') ||
(attribute.key === 'resourceManagerName' && !multiResourceManagers.getOrElse(false))) {
ashtonG
reviewed
Mar 6, 2024
Comment on lines
157
to
161
| <Fragment> | ||
| <Divider /> | ||
| <div className={css.subTitle}>Resource Manager Metadata</div> | ||
| <JsonGlossary json={resourceManagerMetadata} translateLabel={camelCaseToSentence} /> | ||
| </Fragment> |
There was a problem hiding this comment.
nit: use the shorthand here
Suggested change
| <Fragment> | |
| <Divider /> | |
| <div className={css.subTitle}>Resource Manager Metadata</div> | |
| <JsonGlossary json={resourceManagerMetadata} translateLabel={camelCaseToSentence} /> | |
| </Fragment> | |
| <> | |
| <Divider /> | |
| <div className={css.subTitle}>Resource Manager Metadata</div> | |
| <JsonGlossary json={resourceManagerMetadata} translateLabel={camelCaseToSentence} /> | |
| </> |
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
Update resource pool cards to show
Resource Manager Namewhen there are multiple resource managers defined.Update resource pool detail -> Configuration to include a section for resource manager.
Test Plan
Setup the master to have multiple resource managers, with metadata.
Navigate to
/det/clusters, should be able to seeResource Manager Nameat the end of the resource pool cards. Note that this will only show up if we have at least 2 different resource managers configured.Navigate to resource pool details -> Configuration, there should be a section containing resource manager information.
Commentary (optional)
A separate PR is used add the RM name to K8s pool
Checklist
docs/release-notes/.See Release Note for details.
Ticket
RM-10