Fix ondemand k8s showing aws icon rather than k8s (#1391)

RunLLM · May 31, 2023 · 1def56c · 1def56c
1 parent c715756
commit 1def56c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/ui/common/src/components/resources/cards/card.tsx b/src/ui/common/src/components/resources/cards/card.tsx
@@ -2,7 +2,7 @@ import Box from '@mui/material/Box';
 import React from 'react';
 
 import {
-  resolveDisplayService,
+  resolveLogoService,
   Resource,
   resourceExecState,
 } from '../../../utils/resources';
@@ -39,7 +39,7 @@ export const ResourceCard: React.FC<ResourceProps> = ({
           </TruncatedText>
         </Box>
         <ResourceLogo
-          service={resolveDisplayService(resource)}
+          service={resolveLogoService(resource)}
           size="small"
           activated
         />

diff --git a/src/ui/common/src/components/resources/cards/headerDetailsCard.tsx b/src/ui/common/src/components/resources/cards/headerDetailsCard.tsx
@@ -3,7 +3,7 @@ import Typography from '@mui/material/Typography';
 import React from 'react';
 
 import {
-  resolveDisplayService,
+  resolveLogoService,
   Resource,
   resourceExecState,
 } from '../../../utils/resources';
@@ -29,7 +29,7 @@ export const ResourceHeaderDetailsCard: React.FC<
     >
       <Box display="flex" flexDirection="row" alignItems="center">
         <ResourceLogo
-          service={resolveDisplayService(resource)}
+          service={resolveLogoService(resource)}
           size="medium"
           activated
         />

diff --git a/src/ui/common/src/utils/resources.ts b/src/ui/common/src/utils/resources.ts
@@ -42,15 +42,22 @@ export function resourceExecState(resource: Resource): ExecState {
   return resource.exec_state || { status: ExecutionStatus.Succeeded };
 }
 
-// The only resource that does not necessarily display the same service type as
-// on the resource itself is Conda.
-export function resolveDisplayService(resource: Resource): Service {
+// The resolve the service logo to display.
+// This can be different from the actual service. For example:
+// Aq with conda should display conda.
+// AWS, GCP using on-demand K8s should display K8s.
+export function resolveLogoService(resource: Resource): Service {
   if (resource.service === 'Aqueduct') {
     const aqConfig = resource.config as AqueductComputeConfig;
     if (aqConfig.conda_config_serialized) {
       return 'Conda';
     }
   }
+
+  if (resource.service === 'AWS' || resource.service === 'GCP') {
+    return 'Kubernetes';
+  }
+
   return resource.service;
 }