Merge pull request #240 from shiftstack/fix-server-deletion

openshift-merge-robot · web-flow · commit f6b51710d4f3 · 2022-08-02T00:22:01.000+02:00
Bug 1921656: Remove dependence on annotation to allow Server deletion
diff --git a/pkg/cloud/openstack/machine/actuator.go b/pkg/cloud/openstack/machine/actuator.go
@@ -303,8 +303,7 @@ func (oc *OpenstackClient) Delete(ctx context.Context, machine *machinev1.Machin
 		return nil
 	}
 
-	id := machine.ObjectMeta.Annotations[OpenstackIdAnnotationKey]
-	err = machineService.InstanceDelete(id)
+	err = machineService.InstanceDelete(instance.ID)
 	if err != nil {
 		return oc.handleMachineError(machine, apierrors.DeleteMachine(
 			"error deleting Openstack instance: %v", err), deleteEventAction)

Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,7 @@ func (oc OpenstackClient) Delete(ctx context.Context, machine machinev1.Machin`
`303`	`303`	`return nil`
`304`	`304`	`}`
`305`	`305`
`306`		`- id := machine.ObjectMeta.Annotations[OpenstackIdAnnotationKey]`
`307`		`- err = machineService.InstanceDelete(id)`
	`306`	`+ err = machineService.InstanceDelete(instance.ID)`
`308`	`307`	`if err != nil {`
`309`	`308`	`return oc.handleMachineError(machine, apierrors.DeleteMachine(`
`310`	`309`	`"error deleting Openstack instance: %v", err), deleteEventAction)`