fix(apps): use replicas from application spec [r8s-142] (#335)

pull/12512/head
Ali 2025-01-22 12:31:27 +13:00 committed by GitHub
parent a259c28678
commit 7f089fab86
3 changed files with 14 additions and 6 deletions

View File

@ -19,8 +19,15 @@ class KubernetesConfigurationConverter {
res.IsRegistrySecret = secret.IsRegistrySecret;
res.SecretType = secret.SecretType;
if (secret.Annotations) {
const serviceAccountAnnotation = secret.Annotations.find((a) => a.key === 'kubernetes.io/service-account.name');
res.ServiceAccountName = serviceAccountAnnotation ? serviceAccountAnnotation.value : undefined;
const serviceAccountKey = 'kubernetes.io/service-account.name';
if (typeof secret.Annotations === 'object') {
res.ServiceAccountName = secret.Annotations[serviceAccountKey];
} else if (Array.isArray(secret.Annotations)) {
const serviceAccountAnnotation = secret.Annotations.find((a) => a.key === 'kubernetes.io/service-account.name');
res.ServiceAccountName = serviceAccountAnnotation ? serviceAccountAnnotation.value : undefined;
} else {
res.ServiceAccountName = undefined;
}
}
res.Labels = secret.Labels;
return res;

View File

@ -69,11 +69,10 @@ export function getTotalPods(
): number {
switch (application.kind) {
case 'Deployment':
return application.status?.replicas ?? 0;
case 'StatefulSet':
return application.spec?.replicas ?? 0;
case 'DaemonSet':
return application.status?.desiredNumberScheduled ?? 0;
case 'StatefulSet':
return application.status?.replicas ?? 0;
default:
throw new Error('Unknown application type');
}

View File

@ -64,7 +64,9 @@ export function VolumesDatatable() {
settingsManager={tableState}
title="Volumes"
titleIcon={Database}
getRowId={(row) => row.PersistentVolumeClaim.Name}
getRowId={(row) =>
`${row.PersistentVolumeClaim.Name}-${row.ResourcePool.Namespace.Name}`
}
disableSelect={!hasWriteAuth}
isRowSelectable={({ original: volume }) =>
!isSystemNamespace(volume.ResourcePool.Namespace.Name, namespaces) &&