platform/api/azure: Don't wait for resource group deletion

flatcar · Jul 2, 2024 · 44fe874 · 44fe874
1 parent 8262af9
commit 44fe874
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/platform/api/azure/groups.go b/platform/api/azure/groups.go
@@ -58,11 +58,7 @@ func (a *API) TerminateResourceGroup(name string) error {
 	opts := &armresources.ResourceGroupsClientBeginDeleteOptions{
 		ForceDeletionTypes: to.Ptr("Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets"),
 	}
-	poller, err := a.rgClient.BeginDelete(context.TODO(), name, opts)
-	pollOpts := &azruntime.PollUntilDoneOptions{
-		Frequency: 15 * time.Second,
-	}
-	_, err = poller.PollUntilDone(context.TODO(), pollOpts)
+	_, err := a.rgClient.BeginDelete(context.TODO(), name, opts)
 	return err
 }
 

diff --git a/platform/api/azure/instance.go b/platform/api/azure/instance.go
@@ -294,12 +294,9 @@ func (a *API) TerminateInstance(machine *Machine, resourceGroup string) error {
 	_, err := a.compClient.BeginDelete(context.TODO(), resourceGroup, machine.ID, &armcompute.VirtualMachinesClientBeginDeleteOptions{
 		ForceDeletion: to.Ptr(true),
 	})
-	if err != nil {
-		return err
-	}
 	// We used to wait for the VM to be deleted here, but it's not necessary as
 	// we will also delete resource group later.
-	return nil
+	return err
 }
 
 func (a *API) GetConsoleOutput(name, resourceGroup, storageAccount string) ([]byte, error) {