Merge pull request #939 from yaacov/move-overview-pods-to-main-tab

🐾 Show pods on overview tab instead of pods tab
kubev2v · Feb 21, 2024 · 9d5bc3f · 9d5bc3f
2 parents f4fb0bf + c8596d2
commit 9d5bc3f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json b/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json
@@ -64,7 +64,6 @@
   "Conditions": "Conditions",
   "Confirm": "Confirm",
   "Connection Failed": "Connection Failed",
-  "Controller": "Controller",
   "Controller CPU limit": "Controller CPU limit",
   "Controller Memory limit": "Controller Memory limit",
   "Controls the interval at which a new snapshot is requested prior to initiating a warm migration. The default value is 60 minutes.": "Controls the interval at which a new snapshot is requested prior to initiating a warm migration. The default value is 60 minutes.",

diff --git a/packages/forklift-console-plugin/src/modules/Overview/views/overview/OverviewPage.tsx b/packages/forklift-console-plugin/src/modules/Overview/views/overview/OverviewPage.tsx
@@ -10,7 +10,6 @@ import { getOperatorPhase } from '../../utils/helpers/getOperatorPhase';
 
 import OperatorStatus from './components/OperatorStatus';
 import { ShowWelcomeCardButton } from './components/ShowWelcomeCardButton';
-import ForkliftControllerPodsTab from './tabs/Pods/ForkliftControllerPodsTab';
 import { HeaderTitle } from './components';
 import {
   ForkliftControllerDetailsTab,
@@ -39,11 +38,6 @@ export const OverviewPage: React.FC<OverviewPageProps> = () => {
       name: t('Metrics'),
       component: ForkliftControllerMetricsTabWrapper,
     },
-    {
-      href: 'pods',
-      name: t('Pods'),
-      component: ForkliftControllerPodsTabWrapper,
-    },
   ];
 
   return (
@@ -111,12 +105,4 @@ const ForkliftControllerMetricsTabWrapper: React.FC = () => {
   );
 };
 
-const ForkliftControllerPodsTabWrapper: React.FC = () => {
-  const [forkliftController, loaded, loadError] = useK8sWatchForkliftController();
-
-  return (
-    <ForkliftControllerPodsTab obj={forkliftController} loaded={loaded} loadError={loadError} />
-  );
-};
-
 export default OverviewPage;
diff --git a/...-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/ControllerCard.tsx b/...-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/ControllerCard.tsx
@@ -20,12 +20,12 @@ export const ControllerCard: FC<ControllerCardProps> = ({ obj }) => {
     namespaced: true,
     isList: true,
     namespace: obj?.metadata?.namespace,
-    selector: { matchLabels: { app: 'forklift', 'control-plane': 'controller-manager' } },
+    selector: { matchLabels: { app: 'forklift' } },
   });
 
   return (
     <Card>
-      <CardTitle className="forklift-title">{t('Controller')}</CardTitle>
+      <CardTitle className="forklift-title">{t('Pods')}</CardTitle>
       <Suspend obj={pods} loaded={loaded} loadError={loadError}>
         <CardBody>
           <PodsTable pods={pods} />