Skip to content

Commit

Permalink
Merge pull request #2735 from clebs/govmomi-upgrade
Browse files Browse the repository at this point in the history 
🌱 Bump github.com/vmware/govmomi from 0.34.2 to 0.35.0
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Feb 13, 2024
2 parents e35353f + bf56a9c commit 6e658c6
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/vmware-tanzu/vm-operator/api v1.8.5
github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20231214185006-5477585eebfd
github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20231214185006-5477585eebfd
github.com/vmware/govmomi v0.34.2
github.com/vmware/govmomi v0.35.0
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/mod v0.15.0
golang.org/x/tools v0.17.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,8 @@ github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20231214185006-5477585ee
github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20231214185006-5477585eebfd/go.mod h1:5rqRJ9zGR+KnKbkGx373WgN8xJpvAj99kHnfoDYRO5I=
github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20231214185006-5477585eebfd h1:BleW2NxLCPbLvFoTzhoX/DsjCJuKyEdcmvYiY04k18U=
github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20231214185006-5477585eebfd/go.mod h1:dfYrWS8DMRN+XZfhu8M4LVHmeGvYB29Ipd7j4uIq+mU=
github.com/vmware/govmomi v0.34.2 h1:o6ydkTVITOkpQU6HAf6tP5GvHFCNJlNUNlMsvFK77X4=
github.com/vmware/govmomi v0.34.2/go.mod h1:qWWT6n9mdCr/T9vySsoUqcI04sSEj4CqHXxtk/Y+Los=
github.com/vmware/govmomi v0.35.0 h1:vN6m2J5ezSJomSTHyKbvpfoEZTn2mGXWg2FFpjRTRp0=
github.com/vmware/govmomi v0.35.0/go.mod h1:VvIo6siOYFKdF9eU7qrY9+j/F99DV/LtSgsOpxFXJAY=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/janitor/janitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (s *janitor) deleteVSphereVMs(ctx context.Context, folder string) error {

func waitForTasksFinished(ctx context.Context, tasks []*object.Task, ignoreErrors bool) error {
for _, t := range tasks {
if err := t.Wait(ctx); !ignoreErrors && err != nil {
if err := t.WaitEx(ctx); !ignoreErrors && err != nil {
return err
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/govmomi/cluster/vmgroup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func Test_VMGroup(t *testing.T) {

task, err := vmGrp.Add(ctx, vmRef)
g.Expect(err).NotTo(HaveOccurred())
g.Expect(task.Wait(ctx)).To(Succeed())
g.Expect(task.WaitEx(ctx)).To(Succeed())
g.Expect(vmGrp.listVMs()).To(HaveLen(3))

hasVM, err = vmGrp.HasVM(vmRef)
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/govmomi/create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func TestCreate(t *testing.T) {
t.Fatal("could not make vim25 client.")
}
task := object.NewTask(vimClient, taskRef)
err = task.Wait(ctx)
err = task.WaitEx(ctx)
if err != nil {
t.Fatal("error waiting for task:", err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/services/govmomi/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func reconcileVSphereVMWhenNetworkIsReady(ctx context.Context, virtualMachineCtx
&virtualMachineCtx.VMContext,
func() (<-chan []interface{}, <-chan error, error) {
// Wait for the VM to be powered on.
powerOnTaskInfo, err := powerOnTask.WaitForResult(ctx)
powerOnTaskInfo, err := powerOnTask.WaitForResultEx(ctx)
if err != nil && powerOnTaskInfo == nil {
return nil, nil, errors.Wrapf(err, "failed to wait for power on op for vm %s", ctx)
}
Expand Down Expand Up @@ -255,7 +255,7 @@ func reconcileVSphereVMOnTaskCompletion(ctx context.Context, vmCtx *capvcontext.
"taskDescriptionID", task.Info.DescriptionId)

reconcileVSphereVMOnFuncCompletion(ctx, vmCtx, func() ([]interface{}, error) {
taskInfo, err := taskHelper.WaitForResult(ctx)
taskInfo, err := taskHelper.WaitForResultEx(ctx)

// An error is only returned if the process of waiting for the result
// failed, *not* if the task itself failed.
Expand Down
2 changes: 1 addition & 1 deletion test/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/spf13/pflag v1.0.5
github.com/vmware-tanzu/vm-operator/api v1.8.5
github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20231214185006-5477585eebfd
github.com/vmware/govmomi v0.34.2
github.com/vmware/govmomi v0.35.0
go.etcd.io/etcd/api/v3 v3.5.12
go.etcd.io/etcd/client/v3 v3.5.12
golang.org/x/crypto v0.18.0
Expand Down
4 changes: 2 additions & 2 deletions test/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,8 @@ github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20231214185006-5477585ee
github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20231214185006-5477585eebfd/go.mod h1:5rqRJ9zGR+KnKbkGx373WgN8xJpvAj99kHnfoDYRO5I=
github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20231214185006-5477585eebfd h1:BleW2NxLCPbLvFoTzhoX/DsjCJuKyEdcmvYiY04k18U=
github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20231214185006-5477585eebfd/go.mod h1:dfYrWS8DMRN+XZfhu8M4LVHmeGvYB29Ipd7j4uIq+mU=
github.com/vmware/govmomi v0.34.2 h1:o6ydkTVITOkpQU6HAf6tP5GvHFCNJlNUNlMsvFK77X4=
github.com/vmware/govmomi v0.34.2/go.mod h1:qWWT6n9mdCr/T9vySsoUqcI04sSEj4CqHXxtk/Y+Los=
github.com/vmware/govmomi v0.35.0 h1:vN6m2J5ezSJomSTHyKbvpfoEZTn2mGXWg2FFpjRTRp0=
github.com/vmware/govmomi v0.35.0/go.mod h1:VvIo6siOYFKdF9eU7qrY9+j/F99DV/LtSgsOpxFXJAY=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand Down
6 changes: 3 additions & 3 deletions test/infrastructure/vcsim/controllers/vmip_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (r *vmIPReconciler) ReconcileIP(ctx context.Context) (ctrl.Result, error) {
if err != nil {
return reconcile.Result{}, errors.Wrapf(err, "failed to PowerOff vm")
}
if err = task.Wait(ctx); err != nil {
if err = task.WaitEx(ctx); err != nil {
return reconcile.Result{}, errors.Wrapf(err, "failed to PowerOff vm task to complete")
}

Expand Down Expand Up @@ -117,7 +117,7 @@ func (r *vmIPReconciler) ReconcileIP(ctx context.Context) (ctrl.Result, error) {
if err != nil {
return reconcile.Result{}, errors.Wrapf(err, "failed to Customize vm")
}
if err = task.Wait(ctx); err != nil {
if err = task.WaitEx(ctx); err != nil {
return reconcile.Result{}, errors.Wrapf(err, "failed to wait for Customize vm task to complete")
}

Expand All @@ -126,7 +126,7 @@ func (r *vmIPReconciler) ReconcileIP(ctx context.Context) (ctrl.Result, error) {
if err != nil {
return reconcile.Result{}, errors.Wrapf(err, "failed to PowerOn vm")
}
if err = task.Wait(ctx); err != nil {
if err = task.WaitEx(ctx); err != nil {
return reconcile.Result{}, errors.Wrapf(err, "failed to PowerOn vm task to complete")
}

Expand Down

0 comments on commit 6e658c6

Please sign in to comment.