Skip to content

CNV-56688: Avoid CPU helper text error if CPU threads is undefined #2614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
May 6, 2025
Merged

CNV-56688: Avoid CPU helper text error if CPU threads is undefined #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...Input/components/CPUTopologyInput/components/TotalCPUHelperText/CPUTopologyHelperText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ const CPUTopologyHelperText: FC<CPUTopologyHelperTextProps> = ({ cpu }) => {
const { t } = useKubevirtTranslation();
const { cores, sockets, threads } = cpu || {};

const totalCPU = cores * sockets * threads;
// VMs migrated from vSphere may not have spec.template.spec.domain.cpu.threads set
const totalCPU = cores * sockets * (threads || 1);

return (
<div className="cpu-topology-helper-text">
Expand Down
3 changes: 2 additions & 1 deletion src/utils/components/CPUMemoryModal/components/CPUInput/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export const getUpdatedCPU = (cpu: V1CPU, newValue: number, fieldChanged: CPUCom
};

export const convertTopologyToVCPUs = (cpu: V1CPU): number =>
cpu?.cores * cpu?.sockets * cpu?.threads;
// VMs migrated from vSphere may not have spec.template.spec.domain.cpu.threads set
cpu?.cores * cpu?.sockets * (cpu?.threads || 1);

export const formatVCPUsAsSockets = (cpu: V1CPU): V1CPU => {
const numVCPUs = convertTopologyToVCPUs(cpu);
Expand Down
4 changes: 3 additions & 1 deletion src/utils/resources/template/utils/flavor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ export const parseCPU = (cpu: V1CPU): V1CPU => {
*/
export const vCPUCount = (cpu: V1CPU): number => {
const parsedCpu = parseCPU(cpu);
return parsedCpu.sockets * parsedCpu.cores * parsedCpu.threads;

// VMs migrated from vSphere may not have spec.template.spec.domain.cpu.threads set
return parsedCpu.sockets * parsedCpu.cores * (parsedCpu.threads || 1);
};

/**
Expand Down