Do not put machine in failed state if VM is is topping or stopped state, and use ID from instance during deletion

shyamradhakrishnan · shyamradhakrishnan · commit 64cd0f7bea81 · 2023-10-21T08:19:32.000+05:30
diff --git a/controllers/ocimachine_controller.go b/controllers/ocimachine_controller.go
@@ -391,6 +391,7 @@ func (r *OCIMachineReconciler) reconcileNormal(ctx context.Context, logger logr.
 		}
 		fallthrough
 	default:
+		machineScope.SetNotReady()
 		conditions.MarkFalse(machineScope.OCIMachine, infrastructurev1beta2.InstanceReadyCondition, infrastructurev1beta2.InstanceProvisionFailedReason, clusterv1.ConditionSeverityError, "")
 		machineScope.SetFailureReason(capierrors.CreateMachineError)
 		machineScope.SetFailureMessage(errors.Errorf("Instance status %q is unexpected", instance.LifecycleState))

Original file line number	Diff line number	Diff line change
`@@ -391,6 +391,7 @@ func (r *OCIMachineReconciler) reconcileNormal(ctx context.Context, logger logr.`
`391`	`391`	`}`
`392`	`392`	`fallthrough`
`393`	`393`	`default:`
	`394`	`+ machineScope.SetNotReady()`
`394`	`395`	`conditions.MarkFalse(machineScope.OCIMachine, infrastructurev1beta2.InstanceReadyCondition, infrastructurev1beta2.InstanceProvisionFailedReason, clusterv1.ConditionSeverityError, "")`
`395`	`396`	`machineScope.SetFailureReason(capierrors.CreateMachineError)`
`396`	`397`	`machineScope.SetFailureMessage(errors.Errorf("Instance status %q is unexpected", instance.LifecycleState))`