More CronJob support; remove debugging code.

claudio4j · Sep 20, 2024 · 849bbd5 · 849bbd5
1 parent 3e18e2e
commit 849bbd5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/plugin/src/components/ApplicationDetailsCard.tsx b/plugin/src/components/ApplicationDetailsCard.tsx
@@ -54,7 +54,10 @@ const ApplicationDetailsCard: React.FC<{ application: Application }> = ({ applic
     }
 
     function getHealthStatus(application: Application): string | null {
-        return application.status.replicas === application.status.availableReplicas ? "Succeeded" : "Failed";
+        if (application.status) {
+            return application.status.replicas === application.status.availableReplicas ? "Succeeded" : "Failed";
+        }
+        return "Failed";
     }
 
     function checkMetricsEndpointStatus(application: Application) {

diff --git a/plugin/src/pages/HomePage.tsx b/plugin/src/pages/HomePage.tsx
@@ -14,7 +14,7 @@ import { useEffect, useState } from 'react';
 import { NamespaceBar } from '@openshift-console/dynamic-plugin-sdk';
 import ApplicationList from '../components/ApplicationList';
 import { Application } from '../types';
-import { fetchCronjobs, fetchDeployments, fetchDeploymentConfigs, populateAdddionalInfo } from '../services/CamelService';
+import { fetchCronJobs, fetchDeployments, fetchDeploymentConfigs, populateAdddionalInfo } from '../services/CamelService';
 import ApplicationsCPUGraph from '../components/ApplicationsCPUGraph';
 import ApplicationsMemoryGraph from '../components/ApplicationsMemoryGraph';
 
@@ -56,7 +56,7 @@ export const CamelPage: React.FC<CamelHomePageProps> = ({ match }) => {
             })
         });
 
-        fetchCronjobs(activeNamespace).then((apps: Application[]) => {
+        fetchCronJobs(activeNamespace).then((apps: Application[]) => {
             apps.forEach(app => {
                 setApplications((existing: Application[]) => {
                     return [...existing.filter(e => !matching(e, app)), app];
@@ -79,7 +79,7 @@ export const CamelPage: React.FC<CamelHomePageProps> = ({ match }) => {
 
             <Page>
                 <PageSection variant="light">
-                    <Title headingLevel="h1">{t('Camel Applications 123')}</Title>
+                    <Title headingLevel="h1">{t('Camel Applications')}</Title>
                 </PageSection>
                 <PageSection variant="light">
                     <Card>

diff --git a/plugin/src/services/CamelService.ts b/plugin/src/services/CamelService.ts
@@ -1,6 +1,6 @@
 import { consoleFetchJSON } from '@openshift-console/dynamic-plugin-sdk';
 import { ConfigMapKind, CronJobKind, DeploymentConfigKind, DeploymentKind, JobKind, PersistentVolumeClaimKind, PodKind, RouteKind, SecretKind } from '../k8s-types';
-import { Application, cronjobToApplication, deploymentConfigToApplication, deploymentToApplication } from '../types';
+import { Application, cronjobToApplication as cronJobToApplication, deploymentConfigToApplication, deploymentToApplication } from '../types';
 import { sprintf } from 'sprintf-js';
 import { camelApplicationStore } from '../state';
 
@@ -9,7 +9,6 @@ const PROMETHEUS_API_QUERY_PATH = '/api/prometheus/api/v1/query';
 const PROMETHEUS_API_QUERYRANGE_PATH = '/api/prometheus/api/v1/query_range';
 
 export async function fetchDeployments(ns: string): Promise<Application[]> {
-    debugger;
     let deploymentsUri = ns ? '/api/kubernetes/apis/apps/v1/namespaces/' + ns + '/deployments' : '/api/kubernetes/apis/apps/v1/deployments';
     deploymentsUri += '?labelSelector=' + OPENSHIFT_RUNTIME_LABEL
     return consoleFetchJSON(deploymentsUri).then(res => {
@@ -18,13 +17,12 @@ export async function fetchDeployments(ns: string): Promise<Application[]> {
     });
 }
 
-export async function fetchCronjobs(ns: string): Promise<Application[]> {
-    debugger;
+export async function fetchCronJobs(ns: string): Promise<Application[]> {
     let deploymentsUri = ns ? '/api/kubernetes/apis/batch/v1/namespaces/' + ns + '/cronjobs' : '/api/kubernetes/apis/batch/v1/cronjobs';
     deploymentsUri += '?labelSelector=' + OPENSHIFT_RUNTIME_LABEL
     return consoleFetchJSON(deploymentsUri).then(res => {
         return res.items
-            .map((c: CronJobKind) => cronjobToApplication(c));
+            .map((c: CronJobKind) => cronJobToApplication(c));
     });
 }
 
@@ -53,6 +51,12 @@ async function fetchDeploymentConfig(ns: string, name: string): Promise<Applicat
     });
 }
 
+async function fetchCronJob(ns: string, name: string): Promise<Application> {
+    return consoleFetchJSON('/api/kubernetes/apis/batch/v1/namespaces/' + ns + '/cronjobs/' + name).then(res => {
+        return cronJobToApplication(res);
+    });
+}
+
 export async function fetchSecret(ns: string, name: string): Promise<SecretKind> {
     return consoleFetchJSON('/api/kubernetes/api/v1/namespaces/' + ns + '/secrets/' + name).then(res => {
         return res.data;
@@ -308,14 +312,18 @@ export async function fetchApplicationWithMetrics(kind: string, ns: string, name
         case 'DeploymentConfig':
             app = fetchDeploymentConfig(ns, name);
             break;
+        case 'CronJob':
+            app = fetchCronJob(ns, name);
+            break;
         default:
             throw new Error('Invalid kind: ' + kind);
     }
     return app.then(populateRoute).then(populateCpuMetrics).then(populateMemMetrics);
 }
 
 const CamelService = {
-    fetchCronjobs,
+    fetchCronjobs: fetchCronJobs,
+    fetchCronJob,
     fetchDeployments,
     fetchDeploymentConfigs,
     fetchApplications,