++ calculate discount quota from Pod limits

Signed-off-by: Ivan Mikheykin <ivan.mikheykin@flant.com>

Author: diafour

images/virtualization-artifact/pkg/controller/vm/internal/statistic.go

@@ -160,9 +160,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)

images/virtualization-artifact/pkg/controller/vm/internal/statistic_test.go

@@ -310,6 +310,40 @@ var _ = Describe("TestStatisticHandler", func() {
 				MemoryRuntimeOverhead: 0,
 			},
 		),
+		Entry("Memory overhead for Pod with equal limits and requests",
+			newVM(1, ptr.To("25%"), "2Gi"),
+			newKVVMIHotplug(1, 1, 16, "25", "2Gi", "256Gi"),
+			newPod("250m", "1", "3Gi", "3Gi"),
+			expectedValues{
+				CPUCores:           1,
+				CPUCoreFraction:    "25%",
+				CPURequestedCores:  250,
+				CPURuntimeOverhead: 0,
+
+				TopologyCoresPerSocket: 1,
+				TopologySockets:        1,
+
+				MemorySize:            2 * 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", "2Gi", "256Gi"),
+			newPod("250m", "1", "2Gi", "2108Mi"), // 2Gi+60Mi
+			expectedValues{
+				CPUCores:           1,
+				CPUCoreFraction:    "25%",
+				CPURequestedCores:  250,
+				CPURuntimeOverhead: 0,
+
+				TopologyCoresPerSocket: 1,
+				TopologySockets:        1,
+
+				MemorySize:            2 * 1024 * 1024 * 1024,
+				MemoryRuntimeOverhead: 60 * 1024 * 1024,
+			},
+		),
 	)
 })