Merge pull request #808 from akutz/fix/default-cpu-mem-limits

🐛 Set CPU/mem limit to -1 if reservation & no limit

pkg/providers/vsphere/virtualmachine/configspec.go

@@ -110,6 +110,8 @@ func CreateConfigSpec(
 		if !res.Limits.Cpu.IsZero() {
 			lim := CPUQuantityToMhz(vmClassSpec.Policies.Resources.Limits.Cpu, minFreq)
 			configSpec.CpuAllocation.Limit = &lim
+		} else {
+			configSpec.CpuAllocation.Limit = ptr.To[int64](-1)
 		}
 	} else if configSpec.CpuAllocation == nil {
 		// Default to best effort.
@@ -139,6 +141,8 @@ func CreateConfigSpec(
 		if !res.Limits.Memory.IsZero() {
 			lim := MemoryQuantityToMb(vmClassSpec.Policies.Resources.Limits.Memory)
 			configSpec.MemoryAllocation.Limit = &lim
+		} else {
+			configSpec.MemoryAllocation.Limit = ptr.To[int64](-1)
 		}
 	} else if configSpec.MemoryAllocation == nil {
 		// Default to best effort.

pkg/providers/vsphere/virtualmachine/configspec_test.go

@@ -121,6 +121,23 @@ var _ = Describe("CreateConfigSpec", func() {
 					Expect(configSpec.MemoryAllocation.Reservation).To(HaveValue(BeEquivalentTo(0)))
 				})
 			})
+
+			Context("VM Class has request but no limits", func() {
+				BeforeEach(func() {
+					vmClassSpec.Policies.Resources.Limits = vmopv1.VirtualMachineResourceSpec{}
+				})
+
+				It("returns expected config spec", func() {
+					Expect(configSpec.CpuAllocation.Shares).ToNot(BeNil())
+					Expect(configSpec.CpuAllocation.Shares.Level).To(Equal(vimtypes.SharesLevelNormal))
+					Expect(configSpec.CpuAllocation.Limit).To(HaveValue(BeEquivalentTo(-1)))
+					Expect(configSpec.CpuAllocation.Reservation).To(HaveValue(BeEquivalentTo(2684354560000)))
+					Expect(configSpec.MemoryAllocation.Shares).ToNot(BeNil())
+					Expect(configSpec.MemoryAllocation.Shares.Level).To(Equal(vimtypes.SharesLevelNormal))
+					Expect(configSpec.MemoryAllocation.Limit).To(HaveValue(BeEquivalentTo(-1)))
+					Expect(configSpec.MemoryAllocation.Reservation).To(HaveValue(BeEquivalentTo(2048)))
+				})
+			})
 		})
 
 		When("VM has no bios or instance uuid", func() {