Skip to content

Commit

Permalink
fix: no need to show fleet status in KE
Browse files Browse the repository at this point in the history
  • Loading branch information
orangedeng authored and ly5156 committed Sep 27, 2024
1 parent 1993b4c commit ae1f5c0
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
36 changes: 18 additions & 18 deletions shell/pages/c/_cluster/explorer/__tests__/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,24 +69,24 @@ describe('page: cluster dashboard', () => {
});

describe.each([
['local', 'fleet', true, ['fleetDeployment', 'fleetStatefulSet'], [
[STATES_ENUM.IN_PROGRESS, 'icon-spinner', false, false, false, '', 0, 0],
[STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, false, [{ status: 'False' }], 0, 0],
[STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, true, [{ status: 'True' }], 0, 0],
[STATES_ENUM.WARNING, 'icon-warning', true, true, false, [{ status: 'True' }], 0, 0],
[STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 0],
[STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 1],
[STATES_ENUM.HEALTHY, 'icon-checkmark', true, false, false, [{ status: 'True' }], 1, 0],
]],
['downstream RKE2', 'fleet', false, ['fleetStatefulSet'], [
[STATES_ENUM.IN_PROGRESS, 'icon-spinner', false, false, false, '', 0, 0],
[STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, false, [{ status: 'False' }], 0, 0],
[STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, true, [{ status: 'True' }], 0, 0],
[STATES_ENUM.WARNING, 'icon-warning', true, true, false, [{ status: 'True' }], 0, 0],
[STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 0],
[STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 1],
[STATES_ENUM.HEALTHY, 'icon-checkmark', true, false, false, [{ status: 'True' }], 1, 0],
]],
// ['local', 'fleet', true, ['fleetDeployment', 'fleetStatefulSet'], [
// [STATES_ENUM.IN_PROGRESS, 'icon-spinner', false, false, false, '', 0, 0],
// [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, false, [{ status: 'False' }], 0, 0],
// [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, true, [{ status: 'True' }], 0, 0],
// [STATES_ENUM.WARNING, 'icon-warning', true, true, false, [{ status: 'True' }], 0, 0],
// [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 0],
// [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 1],
// [STATES_ENUM.HEALTHY, 'icon-checkmark', true, false, false, [{ status: 'True' }], 1, 0],
// ]],
// ['downstream RKE2', 'fleet', false, ['fleetStatefulSet'], [
// [STATES_ENUM.IN_PROGRESS, 'icon-spinner', false, false, false, '', 0, 0],
// [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, false, [{ status: 'False' }], 0, 0],
// [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, true, [{ status: 'True' }], 0, 0],
// [STATES_ENUM.WARNING, 'icon-warning', true, true, false, [{ status: 'True' }], 0, 0],
// [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 0],
// [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 1],
// [STATES_ENUM.HEALTHY, 'icon-checkmark', true, false, false, [{ status: 'True' }], 1, 0],
// ]],
['downstream RKE2', 'cattle', false, ['cattleDeployment'], [
[STATES_ENUM.IN_PROGRESS, 'icon-spinner', false, false, false, '', 0, 0],
[STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, false, [{ status: 'False' }], 0, 0],
Expand Down
11 changes: 6 additions & 5 deletions shell/pages/c/_cluster/explorer/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,12 @@ export default {
});
}
services.push({
name: 'fleet',
status: this.fleetStatus,
labelKey: 'clusterIndexPage.sections.componentStatus.fleet',
});
// for Kube-explorer, no need to show fleet status
// services.push({
// name: 'fleet',
// status: this.fleetStatus,
// labelKey: 'clusterIndexPage.sections.componentStatus.fleet',
// });
}
return services;
Expand Down

0 comments on commit ae1f5c0

Please sign in to comment.