Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions karpenter/src/NodePool/Details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { DiffEditorDialog } from '../common/resourceEditor';
import { handleShowDiff } from '../helpers/handleDiff';
import { getHandleSaveHelper } from '../helpers/handleSave';
import { renderInstanceRequirements } from '../helpers/instanceRequirements';
import { parseCpu } from '../helpers/parseCpu';
import { parseRam } from '../helpers/parseRam';
import { renderDisruptionBudgets } from '../helpers/renderBudgets';
import { nodePoolClass } from './List';
Expand Down Expand Up @@ -91,8 +92,8 @@ export function NodePoolDetailView(props: { name?: string }) {
withEvents
actions={actions()}
extraInfo={item => {
const usedCPU = parseInt(item.jsonData.status?.resources?.cpu || '0');
const CPUlimit = parseInt(item.jsonData.spec?.limits?.cpu || '0');
const usedCPU = parseCpu(item.jsonData.status?.resources?.cpu || '0');
const CPUlimit = parseCpu(item.jsonData.spec?.limits?.cpu || '0');

const usedMemory = parseRam(item.jsonData.status?.resources?.memory || '0');
const memoryLimit = parseRam(item.jsonData.spec?.limits?.memory || '0');
Expand Down
9 changes: 5 additions & 4 deletions karpenter/src/NodePool/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Link, ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonCompo
import { PercentageBar } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
import { makeCustomResourceClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/crd';
import { getResourceStr } from '@kinvolk/headlamp-plugin/lib/Utils';
import { parseCpu } from '../helpers/parseCpu';
import { parseRam } from '../helpers/parseRam';
import { CPUtooltip, Memorytooltip } from '../helpers/tooltip';

Expand Down Expand Up @@ -73,14 +74,14 @@ function NodePoolsList() {
id: 'nodepool-cpu',
label: t('CPU'),
getValue: nodePool => {
const used = parseInt(nodePool.jsonData.status?.resources?.cpu || '0');
const limit = parseInt(nodePool.jsonData.spec?.limits?.cpu || '0');
const used = parseCpu(nodePool.jsonData.status?.resources?.cpu || '0');
const limit = parseCpu(nodePool.jsonData.spec?.limits?.cpu || '0');

return limit > 0 ? `${used}/${limit}` : t('{{used}} (No limit)', { used });
},
render: nodePool => {
const used = parseInt(nodePool.jsonData.status?.resources?.cpu || 0);
const limit = parseInt(nodePool.jsonData.spec?.limits?.cpu || 0);
const used = parseCpu(nodePool.jsonData.status?.resources?.cpu || '0');
const limit = parseCpu(nodePool.jsonData.spec?.limits?.cpu || '0');
const data: ChartDataPoint[] = [
{
name: 'CPU',
Expand Down
23 changes: 23 additions & 0 deletions karpenter/src/helpers/parseCpu.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { parseCpu } from './parseCpu';

describe('parseCpu', () => {
it('returns 0 for missing or unparseable values', () => {
expect(parseCpu('')).toBe(0);
expect(parseCpu('abc')).toBe(0);
});

it('converts milli-cores to cores', () => {
expect(parseCpu('1750m')).toBe(1.75);
expect(parseCpu('500m')).toBe(0.5);
});

it('converts micro-cores and nano-cores to cores', () => {
expect(parseCpu('500000u')).toBe(0.5);
expect(parseCpu('500000000n')).toBe(0.5);
});

it('keeps unsuffixed quantities as cores', () => {
expect(parseCpu('8')).toBe(8);
expect(parseCpu('1.5')).toBe(1.5);
});
});
18 changes: 18 additions & 0 deletions karpenter/src/helpers/parseCpu.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
export function parseCpu(cpuStr: string): number {
if (!cpuStr) return 0;

const quantity = `${cpuStr}`.trim();
const match = quantity.match(/^(\d+(?:\.\d+)?)(n|u|m)?$/);
if (!match) return 0;

const num = parseFloat(match[1]);
const unit = match[2];

const perCore: Record<string, number> = {
n: 1e9,
u: 1e6,
m: 1e3,
};

return unit ? num / perCore[unit] : num;
}