public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2025-12-15 14:11:46 +00: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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/harvester/mixins/harvester-vm/index.js
View File

@ -687,14 +687,12 @@ export default {
set(this.spec.template.spec, 'domain.memory.maxGuest', this.maxMemory); set(this.spec.template.spec, 'domain.memory.maxGuest', this.maxMemory);
set(this.spec.template.spec, 'domain.resources.limits.memory', this.maxMemory); set(this.spec.template.spec, 'domain.resources.limits.memory', this.maxMemory);
} else { } else {
this.spec.template.spec.domain.cpu.maxSockets = 1;
this.spec.template.spec.domain.cpu.sockets = 1; this.spec.template.spec.domain.cpu.sockets = 1;
this.spec.template.spec.domain.cpu.cores = this.cpu; this.spec.template.spec.domain.cpu.cores = this.cpu;
this.spec.template.spec.domain.resources.limits.cpu = this.cpu?.toString(); this.spec.template.spec.domain.resources.limits.cpu = this.cpu?.toString();
this.spec.template.spec.domain.resources.limits.memory = this.memory; this.spec.template.spec.domain.resources.limits.memory = this.memory;
// clean below fields as we don't need them if not enable CPU and memory hotplug // clean below fields as we don't need them if not enable CPU and memory hotplug
if (this.spec?.template?.spec?.domain?.cpu?.maxSockets) {
delete this.spec.template.spec.domain.cpu.maxSockets;
}
if (this.spec?.template?.spec?.domain?.memory?.maxGuest) { if (this.spec?.template?.spec?.domain?.memory?.maxGuest) {
delete this.spec.template.spec.domain.memory.maxGuest; delete this.spec.template.spec.domain.memory.maxGuest;
} }

11
pkg/harvester/utils/cpuMemory.js
View File

@ -10,10 +10,12 @@ export function getVmCPUMemoryValues(vm) {
} }
const isHotplugEnabled = isCPUMemoryHotPlugEnabled(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) { if (isHotplugEnabled) {
return { return {
cpu: vm.spec.template.spec.domain.cpu.sockets, cpu,
memory: vm.spec.template.spec.domain?.memory?.guest || null, memory: vm.spec.template.spec.domain?.memory?.guest || null,
maxCpu: vm.spec.template.spec.domain.cpu?.maxSockets || 0, maxCpu: vm.spec.template.spec.domain.cpu?.maxSockets || 0,
maxMemory: vm.spec.template.spec.domain?.memory?.maxGuest || null, maxMemory: vm.spec.template.spec.domain?.memory?.maxGuest || null,
@ -21,7 +23,7 @@ export function getVmCPUMemoryValues(vm) {
}; };
} else { } else {
return { return {
cpu: vm.spec.template.spec.domain.cpu.cores, cpu,
memory: vm.spec.template.spec.domain.resources?.limits?.memory || null, memory: vm.spec.template.spec.domain.resources?.limits?.memory || null,
isHotplugEnabled isHotplugEnabled
}; };
@ -29,8 +31,5 @@ export function getVmCPUMemoryValues(vm) {
} }
export function isCPUMemoryHotPlugEnabled(vm) { export function isCPUMemoryHotPlugEnabled(vm) {
return vm?.metadata?.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] === 'true' || return vm?.metadata?.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] === 'true' || !!vm?.spec?.template?.spec?.domain?.memory?.maxGuest || false;
!!vm?.spec?.template?.spec?.domain.cpu?.maxSockets ||
!!vm?.spec?.template?.spec?.domain?.memory?.maxGuest ||
false;
} }