tests, Update Default VMI memory request to 128Mi

As suggested by Cirros community [1], increase default VMI memory to be 128Mi instead of 8Mi or 64Mi in the specific functions that create VMI template and update the memory request to 64M. Use the right notation of Mi instead of M. Remove duplicate memory settings in order to make code lighter. [1] cirros-dev/cirros#52 (comment) Signed-off-by: Or Shoval <[email protected]>
lugangliang · Feb 25, 2021 · a80bb3c · a80bb3c
1 parent 3b8ed60
commit a80bb3c
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 109 deletions.
diff --git a/examples/vm-alpine-datavolume.yaml b/examples/vm-alpine-datavolume.yaml
@@ -37,7 +37,7 @@ spec:
           type: ""
         resources:
           requests:
-            memory: 64M
+            memory: 128Mi
       terminationGracePeriodSeconds: 0
       volumes:
       - dataVolume:

diff --git a/examples/vm-alpine-multipvc.yaml b/examples/vm-alpine-multipvc.yaml
@@ -25,7 +25,7 @@ spec:
           type: ""
         resources:
           requests:
-            memory: 64M
+            memory: 128Mi
       terminationGracePeriodSeconds: 0
       volumes:
       - name: pvcdisk1

diff --git a/examples/vm-cirros.yaml b/examples/vm-cirros.yaml
@@ -25,7 +25,7 @@ spec:
           type: ""
         resources:
           requests:
-            memory: 64M
+            memory: 128Mi
       terminationGracePeriodSeconds: 0
       volumes:
       - containerDisk:

diff --git a/examples/vm-priorityclass.yaml b/examples/vm-priorityclass.yaml
@@ -25,7 +25,7 @@ spec:
           type: ""
         resources:
           requests:
-            memory: 64M
+            memory: 128Mi
       priorityClassName: non-preemtible
       terminationGracePeriodSeconds: 0
       volumes:

diff --git a/examples/vmi-block-pvc.yaml b/examples/vmi-block-pvc.yaml
@@ -16,7 +16,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   terminationGracePeriodSeconds: 0
   volumes:
   - name: blockpvcdisk

diff --git a/examples/vmi-ephemeral.yaml b/examples/vmi-ephemeral.yaml
@@ -16,7 +16,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:

diff --git a/examples/vmi-flavor-small.yaml b/examples/vmi-flavor-small.yaml
@@ -16,7 +16,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:

diff --git a/examples/vmi-host-disk.yaml b/examples/vmi-host-disk.yaml
@@ -16,7 +16,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   terminationGracePeriodSeconds: 0
   volumes:
   - hostDisk:

diff --git a/examples/vmi-migratable.yaml b/examples/vmi-migratable.yaml
@@ -19,7 +19,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   networks:
   - name: default
     pod: {}

diff --git a/examples/vmi-nocloud.yaml b/examples/vmi-nocloud.yaml
@@ -22,7 +22,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:

diff --git a/examples/vmi-preset-small.yaml b/examples/vmi-preset-small.yaml
@@ -10,7 +10,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   selector:
     matchLabels:
       kubevirt.io/vmPreset: vmi-preset-small
diff --git a/examples/vmi-pvc.yaml b/examples/vmi-pvc.yaml
@@ -16,7 +16,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   terminationGracePeriodSeconds: 0
   volumes:
   - name: pvcdisk

diff --git a/examples/vmi-replicaset-cirros.yaml b/examples/vmi-replicaset-cirros.yaml
@@ -23,7 +23,7 @@ spec:
           type: ""
         resources:
           requests:
-            memory: 64M
+            memory: 128Mi
       terminationGracePeriodSeconds: 0
       volumes:
       - containerDisk:

diff --git a/examples/vmi-sata.yaml b/examples/vmi-sata.yaml
@@ -16,7 +16,7 @@ spec:
       type: ""
     resources:
       requests:
-        memory: 64M
+        memory: 128Mi
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:

diff --git a/tests/libvmi/factory.go b/tests/libvmi/factory.go
@@ -75,7 +75,7 @@ func NewCirros(opts ...Option) *kvirtv1.VirtualMachineInstance {
 	cirrosOpts := []Option{
 		WithContainerImage(cd.ContainerDiskFor(cd.ContainerDiskCirros)),
 		WithCloudInitNoCloudUserData("#!/bin/bash\necho 'hello'\n", true),
-		WithResourceMemory("64M"),
+		WithResourceMemory("128Mi"),
 		WithTerminationGracePeriod(DefaultTestGracePeriod),
 	}
 	cirrosOpts = append(cirrosOpts, opts...)

diff --git a/tests/restore_test.go b/tests/restore_test.go
@@ -228,16 +228,16 @@ var _ = Describe("[Serial]VirtualMachineRestore Tests", func() {
 					Expect(err).ToNot(HaveOccurred())
 
 					origSpec = vm.Spec.DeepCopy()
-					Expect(origSpec.Template.Spec.Domain.Resources.Requests[corev1.ResourceMemory]).To(Equal(resource.MustParse("64M")))
+					Expect(origSpec.Template.Spec.Domain.Resources.Requests[corev1.ResourceMemory]).To(Equal(resource.MustParse("128Mi")))
 
-					vm.Spec.Template.Spec.Domain.Resources.Requests[corev1.ResourceMemory] = resource.MustParse("128M")
+					vm.Spec.Template.Spec.Domain.Resources.Requests[corev1.ResourceMemory] = resource.MustParse("256Mi")
 					updatedVM, err = virtClient.VirtualMachine(vm.Namespace).Update(vm)
 					if errors.IsConflict(err) {
 						return false
 					}
 					vm = updatedVM
 					Expect(err).ToNot(HaveOccurred())
-					Expect(vm.Spec.Template.Spec.Domain.Resources.Requests[corev1.ResourceMemory]).To(Equal(resource.MustParse("128M")))
+					Expect(vm.Spec.Template.Spec.Domain.Resources.Requests[corev1.ResourceMemory]).To(Equal(resource.MustParse("256Mi")))
 					return true
 				}, 180*time.Second, time.Second).Should(BeTrue())
 

diff --git a/tests/utils.go b/tests/utils.go
@@ -1917,15 +1917,14 @@ func NewRandomVMIWithNS(namespace string) *v1.VirtualMachineInstance {
 			Masquerade: &v1.InterfaceMasquerade{}}}}}
 
 	vmi.Spec.Networks = []v1.Network{*v1.DefaultPodNetwork()}
+	vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("128Mi")
 
 	return vmi
 }
 
 func NewRandomVMIWithDataVolume(dataVolumeName string) *v1.VirtualMachineInstance {
 	vmi := NewRandomVMI()
 
-	vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
-
 	diskName := "disk0"
 	bus := "virtio"
 	vmi.Spec.Domain.Devices.Disks = append(vmi.Spec.Domain.Devices.Disks, v1.Disk{
@@ -2089,7 +2088,6 @@ func NewRandomMigration(vmiName string, namespace string) *v1.VirtualMachineInst
 func NewRandomVMIWithEphemeralDisk(containerImage string) *v1.VirtualMachineInstance {
 	vmi := NewRandomVMI()
 
-	vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
 	AddEphemeralDisk(vmi, "disk0", "virtio", containerImage)
 	if containerImage == cd.ContainerDiskFor(cd.ContainerDiskFedora) {
 		vmi.Spec.Domain.Devices.Rng = &v1.Rng{} // newer fedora kernels may require hardware RNG to boot
@@ -2231,7 +2229,7 @@ func NewRandomVMIWithFSFromDataVolume(dataVolumeName string) *v1.VirtualMachineI
 
 func NewRandomVMIWithPVCFS(claimName string) *v1.VirtualMachineInstance {
 	vmi := NewRandomVMI()
-	vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
+
 	containerImage := cd.ContainerDiskFor(cd.ContainerDiskFedoraTestTooling)
 	AddEphemeralDisk(vmi, "disk0", "virtio", containerImage)
 	vmi = AddPVCFS(vmi, "disk1", claimName)
@@ -2342,14 +2340,14 @@ func addCloudInitDiskAndVolume(vmi *v1.VirtualMachineInstance, name string, volu
 
 func NewRandomVMIWithPVC(claimName string) *v1.VirtualMachineInstance {
 	vmi := NewRandomVMI()
-	vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
+
 	vmi = AddPVCDisk(vmi, "disk0", "virtio", claimName)
 	return vmi
 }
 
 func NewRandomVMIWithPVCAndUserData(claimName, userData string) *v1.VirtualMachineInstance {
 	vmi := NewRandomVMI()
-	vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
+
 	vmi = AddPVCDisk(vmi, "disk0", "virtio", claimName)
 	AddUserData(vmi, "disk1", userData)
 	return vmi
@@ -2467,7 +2465,6 @@ func deleteBlockPVAndPVC() {
 func NewRandomVMIWithCDRom(claimName string) *v1.VirtualMachineInstance {
 	vmi := NewRandomVMI()
 
-	vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
 	vmi.Spec.Domain.Devices.Disks = append(vmi.Spec.Domain.Devices.Disks, v1.Disk{
 		Name: "disk0",
 		DiskDevice: v1.DiskDevice{
@@ -2492,7 +2489,6 @@ func NewRandomVMIWithCDRom(claimName string) *v1.VirtualMachineInstance {
 func NewRandomVMIWithEphemeralPVC(claimName string) *v1.VirtualMachineInstance {
 	vmi := NewRandomVMI()
 
-	vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
 	vmi.Spec.Domain.Devices.Disks = append(vmi.Spec.Domain.Devices.Disks, v1.Disk{
 		Name: "disk0",
 		DiskDevice: v1.DiskDevice{

diff --git a/tests/vm_test.go b/tests/vm_test.go
@@ -158,8 +158,6 @@ var _ = Describe("[rfe_id:1177][crit:medium][vendor:[email protected]][level:com
 
 				vmi := tests.NewRandomVMI()
 
-				vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
-
 				diskName := "disk0"
 				bus := "virtio"
 				vmi.Spec.Domain.Devices.Disks = append(vmi.Spec.Domain.Devices.Disks, v1.Disk{
@@ -205,8 +203,6 @@ var _ = Describe("[rfe_id:1177][crit:medium][vendor:[email protected]][level:com
 
 				vmi := tests.NewRandomVMI()
 
-				vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("64M")
-
 				diskName := "disk0"
 				bus := "virtio"
 				vmi.Spec.Domain.Devices.Disks = append(vmi.Spec.Domain.Devices.Disks, v1.Disk{