public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2026-10-01 03:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: set maxSockets : 1 if not enabled cpuMemoryhotplug (#539)

Browse Source
This commit is contained in:
Andy Lee
2025-10-02 17:50:16 +08:00
committed by GitHub
parent 7dbd442519
commit 4bb67153ce
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/harvester/utils/cpuMemory.js
+5 -6
View File
@@ -10,10 +10,12 @@ export function getVmCPUMemoryValues(vm) {
}
const isHotplugEnabled = isCPUMemoryHotPlugEnabled(vm);
const { sockets = 1, threads = 1, cores = 1 } = vm.spec.template.spec.domain.cpu || {};
const cpu = sockets * threads * cores;
if (isHotplugEnabled) {
return {
cpu: vm.spec.template.spec.domain.cpu.sockets,
cpu,
memory: vm.spec.template.spec.domain?.memory?.guest || null,
maxCpu: vm.spec.template.spec.domain.cpu?.maxSockets || 0,
maxMemory: vm.spec.template.spec.domain?.memory?.maxGuest || null,
@@ -21,7 +23,7 @@ export function getVmCPUMemoryValues(vm) {
};
} else {
return {
cpu: vm.spec.template.spec.domain.cpu.cores,
cpu,
memory: vm.spec.template.spec.domain.resources?.limits?.memory || null,
isHotplugEnabled
};
@@ -29,8 +31,5 @@ export function getVmCPUMemoryValues(vm) {
}
export function isCPUMemoryHotPlugEnabled(vm) {
return vm?.metadata?.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] === 'true' ||
!!vm?.spec?.template?.spec?.domain.cpu?.maxSockets ||
!!vm?.spec?.template?.spec?.domain?.memory?.maxGuest ||
false;
return vm?.metadata?.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] === 'true' || !!vm?.spec?.template?.spec?.domain?.memory?.maxGuest || false;
}