Skip to content

Backport: chore(vm): memory limits on Pod for namespaces with quotas (#2309) #2326

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
diafour merged 1 commit into from
May 6, 2026
Merged

Backport: chore(vm): memory limits on Pod for namespaces with quotas (#2309) #2326

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
2 changes: 1 addition & 1 deletion build/components/versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ firmware:
libvirt: v10.9.0
edk2: stable202411
core:
3p-kubevirt: v1.6.2-v12n.25
3p-kubevirt: v1.6.2-v12n.25.1
3p-containerized-data-importer: v1.60.3-v12n.18
distribution: 2.8.3
package:
Expand Down
5 changes: 3 additions & 2 deletions images/virtualization-artifact/pkg/controller/vm/internal/statistic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,10 @@ func (h *StatisticHandler) syncResources(changed *v1alpha2.VirtualMachine,
}

memoryKVVMIRequest := kvvmi.Spec.Domain.Resources.Requests[corev1.ResourceMemory]
memoryPodRequest := ctr.Resources.Requests[corev1.ResourceMemory]
// Kubevirt makes memory limits equal or slightly greater than requests. See https://github.com/deckhouse/virtualization/pull/1947
memoryPodLimit := ctr.Resources.Limits[corev1.ResourceMemory]

memoryOverhead := memoryPodRequest.DeepCopy()
memoryOverhead := memoryPodLimit.DeepCopy()
memoryOverhead.Sub(memoryKVVMIRequest)
mi := int64(1024 * 1024)
memoryOverhead = *resource.NewQuantity(int64(math.Ceil(float64(memoryOverhead.Value())/float64(mi)))*mi, resource.BinarySI)
Expand Down
81 changes: 75 additions & 6 deletions images/virtualization-artifact/pkg/controller/vm/internal/statistic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,11 @@ var _ = Describe("TestStatisticHandler", func() {

// Generate KVVMI with "dynamic cores" specifics: cores and sockets are intentionally
// swapped to bypass kvvm validations.
newKVVMIHotplug := func(cores, sockets, maxCores int, cpuFraction, memory, maxMemory string) *virtv1.VirtualMachineInstance {
newKVVMIHotplug := func(cores, sockets, maxCores int, cpuFraction, memory string) *virtv1.VirtualMachineInstance {
kvvmi := newEmptyKVVMI(vmName, vmNamespace)
memoryGuest := resource.MustParse(memory)
memoryMaxGuest := resource.MustParse(maxMemory)

memoryMaxGuest := resource.NewQuantity(kvbuilder.MaxMemorySizeForHotplug, resource.BinarySI)

kvvmi.SetAnnotations(map[string]string{
kvbuilder.CPUResourcesRequestsFractionAnnotation: cpuFraction,
Expand All @@ -104,7 +105,7 @@ var _ = Describe("TestStatisticHandler", func() {
},
Memory: &virtv1.Memory{
Guest: &memoryGuest,
MaxGuest: &memoryMaxGuest,
MaxGuest: memoryMaxGuest,
},
Resources: virtv1.ResourceRequirements{
Requests: corev1.ResourceList{
Expand Down Expand Up @@ -258,7 +259,7 @@ var _ = Describe("TestStatisticHandler", func() {
),
Entry("Hotplug enabled: 8 cores, 100% fraction, 2 Gi",
newVM(8, ptr.To("100%"), "2Gi"),
newKVVMIHotplug(8, 1, 16, "100", "2Gi", "256Gi"),
newKVVMIHotplug(8, 1, 16, "100", "2Gi"),
newPod("8", "8", "2Gi", "2Gi"),
expectedValues{
CPUCores: 8,
Expand All @@ -275,7 +276,7 @@ var _ = Describe("TestStatisticHandler", func() {
),
Entry("Hotplug enabled: 8 cores, 25% fraction, 2 Gi",
newVM(8, ptr.To("25%"), "2Gi"),
newKVVMIHotplug(8, 1, 16, "25", "2Gi", "256Gi"),
newKVVMIHotplug(8, 1, 16, "25", "2Gi"),
newPod("2", "8", "2Gi", "2Gi"),
expectedValues{
CPUCores: 8,
Expand All @@ -292,7 +293,7 @@ var _ = Describe("TestStatisticHandler", func() {
),
Entry("Hotplug enabled: 1 core, 25% fraction, 2 Gi",
newVM(1, ptr.To("25%"), "2Gi"),
newKVVMIHotplug(1, 1, 16, "25", "2Gi", "256Gi"),
newKVVMIHotplug(1, 1, 16, "25", "2Gi"),
newPod("250m", "1", "2Gi", "2Gi"),
expectedValues{
CPUCores: 1,
Expand All @@ -307,5 +308,73 @@ var _ = Describe("TestStatisticHandler", func() {
MemoryRuntimeOverhead: 0,
},
),
Entry("Hotplug enabled: 24 cores, 25% fraction, 2 Gi",
newVM(1, ptr.To("25%"), "2Gi"),
newKVVMIHotplug(12, 2, 16, "25", "2Gi"),
newPod("6", "24", "2Gi", "2Gi"),
expectedValues{
CPUCores: 24,
CPUCoreFraction: "25%",
CPURequestedCores: 6000,
CPURuntimeOverhead: 0,

TopologyCoresPerSocket: 12,
TopologySockets: 2,

MemorySize: 2147483648,
MemoryRuntimeOverhead: 0,
},
),
Entry("Hotplug enabled: max cores, 24 cores, 50% fraction, 2 Gi",
newVM(1, ptr.To("50%"), "2Gi"),
newKVVMIHotplug(32, 8, 32, "50", "2Gi"),
newPod("6", "24", "2Gi", "2Gi"),
expectedValues{
CPUCores: 256,
CPUCoreFraction: "50%",
CPURequestedCores: 128000,
CPURuntimeOverhead: 0,

TopologyCoresPerSocket: 32,
TopologySockets: 8,

MemorySize: 2147483648,
MemoryRuntimeOverhead: 0,
},
),
Entry("Memory overhead for Pod with equal limits and requests",
newVM(1, ptr.To("25%"), "2Gi"),
newKVVMIHotplug(1, 1, 16, "25", "3Gi"),
newPod("250m", "1", "4Gi", "4Gi"),
expectedValues{
CPUCores: 1,
CPUCoreFraction: "25%",
CPURequestedCores: 250,
CPURuntimeOverhead: 0,

TopologyCoresPerSocket: 1,
TopologySockets: 1,

MemorySize: 3 * 1024 * 1024 * 1024,
MemoryRuntimeOverhead: 1024 * 1024 * 1024,
},
),
Entry("Memory overhead for Pod with limits greater than requests",
newVM(1, ptr.To("25%"), "2Gi"),
newKVVMIHotplug(1, 1, 16, "25", "3Gi"),
newPod("250m", "1", "4Gi", "4156Mi"), // Overhead is 1Gi+60Mi
expectedValues{
CPUCores: 1,
CPUCoreFraction: "25%",
CPURequestedCores: 250,
CPURuntimeOverhead: 0,

TopologyCoresPerSocket: 1,
TopologySockets: 1,

MemorySize: 3 * 1024 * 1024 * 1024,
MemoryRuntimeOverhead: 1024*1024*1024 + 60*1024*1024,
},
),
)
})
Loading