Simplify handling of GitRepo status resources #13244
Merged
+129
−190
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
aruiz14
force-pushed
the
fleet-resources-rework
branch
from
0c7cec3 to
8de803e
Compare
aruiz14
force-pushed
the
fleet-resources-rework
branch
from
8de803e to
25273f0
Compare
aruiz14
commented
Feb 6, 2025
Comment on lines
+5
to
+36
| const getResourcesDefaultState = (labelGetter, stateKey) => { | ||
| return [ | ||
| STATES_ENUM.READY, | ||
| STATES_ENUM.NOT_READY, | ||
| STATES_ENUM.WAIT_APPLIED, | ||
| STATES_ENUM.MODIFIED, | ||
| STATES_ENUM.MISSING, | ||
| STATES_ENUM.ORPHANED, | ||
| STATES_ENUM.UNKNOWN, | ||
| ].reduce((acc, state) => { | ||
| acc[state] = { | ||
| count: 0, | ||
| color: STATES[STATES_ENUM.READY].color, | ||
| label: labelGetter(`${ stateKey }.${ STATES_ENUM.READY }`, null, STATES[STATES_ENUM.READY].label ), | ||
| status: STATES_ENUM.READY | ||
| }, | ||
| info: { | ||
| count: 0, | ||
| color: STATES[STATES_ENUM.INFO].color, | ||
| label: labelGetter(`${ stateKey }.${ STATES_ENUM.INFO }`, null, STATES[STATES_ENUM.INFO].label ), | ||
| status: STATES_ENUM.INFO | ||
| }, | ||
| warning: { | ||
| count: 0, | ||
| color: STATES[STATES_ENUM.WARNING].color, | ||
| label: labelGetter(`${ stateKey }.${ STATES_ENUM.WARNING }`, null, STATES[STATES_ENUM.WARNING].label ), | ||
| status: STATES_ENUM.WARNING | ||
| }, | ||
| notready: { | ||
| count: 0, | ||
| color: STATES[STATES_ENUM.NOT_READY].color, | ||
| label: labelGetter(`${ stateKey }.${ STATES_ENUM.NOT_READY }`, null, STATES[STATES_ENUM.NOT_READY].label ), | ||
| status: STATES_ENUM.NOT_READY | ||
| }, | ||
| error: { | ||
| count: 0, | ||
| color: STATES[STATES_ENUM.ERROR].color, | ||
| label: labelGetter(`${ stateKey }.${ STATES_ENUM.ERROR }`, null, STATES[STATES_ENUM.ERROR].label ), | ||
| status: STATES_ENUM.ERROR | ||
| }, | ||
| errapplied: { | ||
| count: 0, | ||
| color: STATES[STATES_ENUM.ERR_APPLIED].color, | ||
| label: labelGetter(`${ stateKey }.${ STATES_ENUM.ERR_APPLIED }`, null, STATES[STATES_ENUM.ERR_APPLIED].label ), | ||
| status: STATES_ENUM.ERR_APPLIED, | ||
| }, | ||
| waitapplied: { | ||
| count: 0, | ||
| color: STATES[STATES_ENUM.WAIT_APPLIED].color, | ||
| label: labelGetter(`${ stateKey }.${ STATES_ENUM.WAIT_APPLIED }`, null, STATES[STATES_ENUM.WAIT_APPLIED].label ), | ||
| status: STATES_ENUM.WAIT_APPLIED | ||
| }, | ||
| unknown: { | ||
| color: STATES[state].color, | ||
| label: labelGetter(`${ stateKey }.${ state }`, null, STATES[state].label ), | ||
| status: state | ||
| }; | ||
| return acc; | ||
| }, {}); | ||
| }; | ||
| const getBundlesDefaultState = (labelGetter, stateKey) => { | ||
| return [ | ||
| STATES_ENUM.READY, | ||
| STATES_ENUM.INFO, | ||
| STATES_ENUM.WARNING, | ||
| STATES_ENUM.NOT_READY, | ||
| STATES_ENUM.ERROR, | ||
| STATES_ENUM.ERR_APPLIED, | ||
| STATES_ENUM.WAIT_APPLIED, | ||
| STATES_ENUM.UNKNOWN, | ||
| ].reduce((acc, state) => { |
There was a problem hiding this comment.
Bundles and resources can have different states (e.g. missing and orphaned, which do not make sense for bundles). The result is:
aruiz14
force-pushed
the
fleet-resources-rework
branch
from
25273f0 to
762359e
Compare
aruiz14
force-pushed
the
fleet-resources-rework
branch
from
56f94e2 to
23e53a9
Compare
torchiaf
requested changes
Feb 10, 2025
Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
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.
Summary
Change how the GitRepo status info is obtained and processed, by consuming the new fields exposed by Fleet.
Occurred changes and/or fixed issues
Fixes #13243
Technical notes summary
This PR changes (again, see #12896) the way that bundles state is processed, by iterating over the list of bundles, for simplicity.
Also:
PerClusterResourceCountsstatus fieldResources.perClusterStatein order to build the GitRepo's resource table, getting rid of BundleDeployments altogether.Areas or cases that should be tested
Areas which could experience regressions
There is a small regression in the Resources table for GitRepos, since the info backing the
Agecolumn is no longer available. However, this field was often blank as it's not always available.Screenshot/Video
Checklist