Merge pull request kubernetes-sigs#2467 from k8s-infra-cherrypick-robot/cherry-pick-2464-to-release-0.12

k8s-ci-robot · web-flow · commit f3ba4ac22647 · 2025-03-06T08:49:44.000-08:00
[release-0.12] 🐛 fix: dereference the instance state in machine state reconcile calls
diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go
@@ -453,7 +453,7 @@ func (r *OpenStackMachineReconciler) reconcileMachineState(scope *scope.WithLogg
 		// The other state is normal (for example, migrating, shutoff) but we don't want to proceed until it's ACTIVE
 		// due to potential conflict or unexpected actions
 		scope.Logger().Info("Waiting for instance to become ACTIVE", "id", openStackServer.Status.InstanceID, "status", openStackServer.Status.InstanceState)
-		conditions.MarkUnknown(openStackMachine, infrav1.InstanceReadyCondition, infrav1.InstanceNotReadyReason, "Instance state is not handled: %v", openStackServer.Status.InstanceState)
+		conditions.MarkUnknown(openStackMachine, infrav1.InstanceReadyCondition, infrav1.InstanceNotReadyReason, "Instance state is not handled: %v", ptr.Deref(openStackServer.Status.InstanceState, infrav1.InstanceStateUndefined))
 
 		return &ctrl.Result{RequeueAfter: waitForInstanceBecomeActiveToReconcile}
 	}

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ func (r OpenStackMachineReconciler) reconcileMachineState(scope scope.WithLogg`
`453`	`453`	`// The other state is normal (for example, migrating, shutoff) but we don't want to proceed until it's ACTIVE`
`454`	`454`	`// due to potential conflict or unexpected actions`
`455`	`455`	`scope.Logger().Info("Waiting for instance to become ACTIVE", "id", openStackServer.Status.InstanceID, "status", openStackServer.Status.InstanceState)`
`456`		`- conditions.MarkUnknown(openStackMachine, infrav1.InstanceReadyCondition, infrav1.InstanceNotReadyReason, "Instance state is not handled: %v", openStackServer.Status.InstanceState)`
	`456`	`+ conditions.MarkUnknown(openStackMachine, infrav1.InstanceReadyCondition, infrav1.InstanceNotReadyReason, "Instance state is not handled: %v", ptr.Deref(openStackServer.Status.InstanceState, infrav1.InstanceStateUndefined))`
`457`	`457`
`458`	`458`	`return &ctrl.Result{RequeueAfter: waitForInstanceBecomeActiveToReconcile}`
`459`	`459`	`}`