BREAKING: Allow custom condition reasons to be returned from Create (#…

…1925)
kubernetes-sigs · Jan 22, 2025 · af00eb4 · af00eb4
1 parent 5128b39
commit af00eb4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pkg/cloudprovider/types.go b/pkg/cloudprovider/types.go
@@ -388,12 +388,14 @@ func IsNodeClassNotReadyError(err error) bool {
 // CreateError is an error type returned by CloudProviders when instance creation fails
 type CreateError struct {
 	error
+	ConditionReason  string
 	ConditionMessage string
 }
 
-func NewCreateError(err error, message string) *CreateError {
+func NewCreateError(err error, reason, message string) *CreateError {
 	return &CreateError{
 		error:            err,
+		ConditionReason:  reason,
 		ConditionMessage: message,
 	}
 }
diff --git a/pkg/controllers/nodeclaim/lifecycle/launch.go b/pkg/controllers/nodeclaim/lifecycle/launch.go
@@ -103,7 +103,7 @@ func (l *Launch) launchNodeClaim(ctx context.Context, nodeClaim *v1.NodeClaim) (
 		default:
 			var createError *cloudprovider.CreateError
 			if errors.As(err, &createError) {
-				nodeClaim.StatusConditions().SetUnknownWithReason(v1.ConditionTypeLaunched, "LaunchFailed", createError.ConditionMessage)
+				nodeClaim.StatusConditions().SetUnknownWithReason(v1.ConditionTypeLaunched, createError.ConditionReason, createError.ConditionMessage)
 			} else {
 				nodeClaim.StatusConditions().SetUnknownWithReason(v1.ConditionTypeLaunched, "LaunchFailed", truncateMessage(err.Error()))
 			}

diff --git a/pkg/controllers/nodeclaim/lifecycle/launch_test.go b/pkg/controllers/nodeclaim/lifecycle/launch_test.go
@@ -103,14 +103,16 @@ var _ = Describe("Launch", func() {
 		ExpectNotFound(ctx, env.Client, nodeClaim)
 	})
 	It("should set nodeClaim status condition from the condition message received if error returned is CreateError", func() {
+		conditionReason := "CustomReason"
 		conditionMessage := "instance creation failed"
-		cloudProvider.NextCreateErr = cloudprovider.NewCreateError(fmt.Errorf("error launching instance"), conditionMessage)
+		cloudProvider.NextCreateErr = cloudprovider.NewCreateError(fmt.Errorf("error launching instance"), conditionReason, conditionMessage)
 		nodeClaim := test.NodeClaim()
 		ExpectApplied(ctx, env.Client, nodeClaim)
 		_ = ExpectObjectReconcileFailed(ctx, env.Client, nodeClaimController, nodeClaim)
 		nodeClaim = ExpectExists(ctx, env.Client, nodeClaim)
 		condition := ExpectStatusConditionExists(nodeClaim, v1.ConditionTypeLaunched)
 		Expect(condition.Status).To(Equal(metav1.ConditionUnknown))
+		Expect(condition.Reason).To(Equal(conditionReason))
 		Expect(condition.Message).To(Equal(conditionMessage))
 	})
 })