Skip to content

Commit 80138a9

Browse files
authored
chore(deps): bump vmware/govmomi to 0.53.0 (#677)
Bumps [github.com/vmware/govmomi](https://github.com/vmware/govmomi) from 0.52.0 to 0.53.0. - [Release notes](https://github.com/vmware/govmomi/releases) - [Changelog](https://github.com/vmware/govmomi/blob/main/CHANGELOG.md) - [Commits](vmware/govmomi@v0.52.0...v0.53.0) --- updated-dependencies: - dependency-name: github.com/vmware/govmomi dependency-version: 0.53.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: Ryan Johnson <ryan.johnson@broadcom.com>
1 parent bfc8fac commit 80138a9

4 files changed

Lines changed: 14 additions & 9 deletions

File tree

builder/vsphere/driver/vm.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,9 @@ func (vm *VirtualMachineDriver) Destroy() error {
609609
func (vm *VirtualMachineDriver) Configure(config *HardwareConfig) error {
610610
var confSpec types.VirtualMachineConfigSpec
611611
confSpec.NumCPUs = config.CPUs
612-
confSpec.NumCoresPerSocket = config.CpuCores
612+
if config.CpuCores != 0 {
613+
confSpec.NumCoresPerSocket = &config.CpuCores
614+
}
613615
confSpec.MemoryMB = config.RAM
614616

615617
var cpuSpec types.ResourceAllocationInfo

builder/vsphere/iso/builder_acc_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,11 @@ func checkHardware(name string) error {
239239
}
240240

241241
cpuCores := vmInfo.Config.Hardware.NumCoresPerSocket
242-
if cpuCores != 2 {
243-
return fmt.Errorf("VM should have 2 CPU cores per socket, but returned %v", cpuCores)
242+
if cpuCores == nil {
243+
return fmt.Errorf("VM should have 2 CPU cores per socket, but returned nil")
244+
}
245+
if *cpuCores != 2 {
246+
return fmt.Errorf("VM should have 2 CPU cores per socket, but returned %v", *cpuCores)
244247
}
245248

246249
cpuReservation := *vmInfo.Config.CpuAllocation.Reservation
@@ -288,7 +291,7 @@ func checkHardware(name string) error {
288291

289292
v := l.SelectByType((*types.VirtualMachineVideoCard)(nil))
290293
if len(v) != 1 {
291-
return fmt.Errorf("virtual machine should have one video card")
294+
return fmt.Errorf("virtual machine")
292295
}
293296
if v[0].(*types.VirtualMachineVideoCard).VideoRamSizeInKB != 8192 {
294297
return fmt.Errorf("video memory should be equal 8192")

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/pkg/errors v0.9.1
1111
github.com/vmware-tanzu/image-registry-operator-api v0.0.0-20240422225856-ad6a4cd477e0
1212
github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250406160248-af0c660a6ede
13-
github.com/vmware/govmomi v0.52.0
13+
github.com/vmware/govmomi v0.53.0
1414
github.com/zclconf/go-cty v1.18.0
1515
golang.org/x/mobile v0.0.0-20210901025245-1fde1d6c3ca1
1616
gopkg.in/yaml.v2 v2.4.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
418418
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
419419
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
420420
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
421-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
422-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
421+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
422+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
423423
github.com/tidwall/transform v0.0.0-20201103190739-32f242e2dbde h1:AMNpJRc7P+GTwVbl8DkK2I9I8BBUzNiHuH/tlxrpan0=
424424
github.com/tidwall/transform v0.0.0-20201103190739-32f242e2dbde/go.mod h1:MvrEmduDUz4ST5pGZ7CABCnOU5f3ZiOAZzT6b1A6nX8=
425425
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
@@ -436,8 +436,8 @@ github.com/vmware-tanzu/image-registry-operator-api v0.0.0-20240422225856-ad6a4c
436436
github.com/vmware-tanzu/image-registry-operator-api v0.0.0-20240422225856-ad6a4cd477e0/go.mod h1:zn/ponkeFUViyBDhYp9OKFPqEGWYrsR71Pn9/aTCvSI=
437437
github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250406160248-af0c660a6ede h1:6MqX+Jq9rmgALixuwV4LQkU7HA8vQCl0u9Jg8mSsxV0=
438438
github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250406160248-af0c660a6ede/go.mod h1:V0JbH4beGCU+q7yqnWUYYOuDij0ut5i1iBO4cyzg+tM=
439-
github.com/vmware/govmomi v0.52.0 h1:JyxQ1IQdllrY7PJbv2am9mRsv3p9xWlIQ66bv+XnyLw=
440-
github.com/vmware/govmomi v0.52.0/go.mod h1:Yuc9xjznU3BH0rr6g7MNS1QGvxnJlE1vOvTJ7Lx7dqI=
439+
github.com/vmware/govmomi v0.53.0 h1:e1bZCotAq7wm4xy95ePN2uoWwz28pNp/ewZZhpBY7/4=
440+
github.com/vmware/govmomi v0.53.0/go.mod h1:EWfuzPfxT5NV+aS2we02SLFdhvJkgeY7t7+TszgBSMY=
441441
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
442442
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
443443
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

0 commit comments

Comments
 (0)