Merge pull request kubevirt#2416 from ahadas/fix_docs

Fix documentation of OvercommitGuestOverhead

api/openapi-spec/swagger.json

@@ -5577,7 +5577,7 @@
       "type": "object"
      },
      "overcommitGuestOverhead": {
-      "description": "Don't ask the scheduler to take the guest-management overhead into account. Instead\nput the overhead only into the requested memory limits. This can lead to crashes if\nall memory is in use on a node. Defaults to false.",
+      "description": "Don't ask the scheduler to take the guest-management overhead into account. Instead\nput the overhead only into the container's memory limit. This can lead to crashes if\nall memory is in use on a node. Defaults to false.",
       "type": "boolean"
      },
      "requests": {

pkg/virt-controller/services/template.go

@@ -989,11 +989,12 @@ func getMemoryOverhead(domain v1.DomainSpec) *resource.Quantity {
 
 	// Add CPU table overhead (8 MiB per vCPU and 8 MiB per IO thread)
 	// overhead per vcpu in MiB
-	coresMemory := uint32(8)
+	coresMemory := resource.MustParse("8Mi")
 	if domain.CPU != nil {
-		coresMemory *= domain.CPU.Cores
+		value := coresMemory.Value() * int64(domain.CPU.Cores)
+		coresMemory = *resource.NewQuantity(value, coresMemory.Format)
 	}
-	overhead.Add(resource.MustParse(strconv.Itoa(int(coresMemory)) + "Mi"))
+	overhead.Add(coresMemory)
 
 	// static overhead for IOThread
 	overhead.Add(resource.MustParse("8Mi"))

staging/src/kubevirt.io/client-go/api/v1/schema.go

@@ -209,7 +209,7 @@ type ResourceRequirements struct {
 	// +optional
 	Limits v1.ResourceList `json:"limits,omitempty"`
 	// Don't ask the scheduler to take the guest-management overhead into account. Instead
-	// put the overhead only into the requested memory limits. This can lead to crashes if
+	// put the overhead only into the container's memory limit. This can lead to crashes if
 	// all memory is in use on a node. Defaults to false.
 	OvercommitGuestOverhead bool `json:"overcommitGuestOverhead,omitempty"`
 }