Merge pull request #2899 from chrischdi/pr-e2e-ip-teardown-best-effort

🌱 test: teardown ipam only on best-effort base to not fail successful tests

test/e2e/e2e_suite_test.go

@@ -305,7 +305,10 @@ var _ = SynchronizedAfterSuite(func() {
 		case VCenterTestTarget:
 			// Cleanup the in cluster address manager
 			vSphereFolderName := e2eConfig.GetVariable("VSPHERE_FOLDER")
-			Expect(inClusterAddressManager.Teardown(ctx, vsphereip.MachineFolder(vSphereFolderName), vsphereip.VSphereClient(vsphereClient))).To(Succeed())
+			err := inClusterAddressManager.Teardown(ctx, vsphereip.MachineFolder(vSphereFolderName), vsphereip.VSphereClient(vsphereClient))
+			if err != nil {
+				Byf("Ignoring Teardown error: %v", err)
+			}
 
 		case VCSimTestTarget:
 			// Cleanup the vcsim address manager

test/framework/ip/incluster.go

@@ -248,13 +248,13 @@ func getVirtualMachineIPAddresses(ctx context.Context, folderName string, vSpher
 	// Find the given folder.
 	folder, err := finder.FolderOrDefault(ctx, folderName)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "getting default folder")
 	}
 
 	// List all VirtualMachines in the folder.
 	managedObjects, err := finder.ManagedObjectListChildren(ctx, folder.InventoryPath+"/...", "VirtualMachine")
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "finding VirtualMachines")
 	}
 
 	var vm mo.VirtualMachine