Fix linting issues:

Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · Oct 10, 2024 · 00eee39 · 00eee39
1 parent da39f02
commit 00eee39
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/internal/deprecated/workflow/post.go b/internal/deprecated/workflow/post.go
@@ -19,8 +19,7 @@ func (s *state) postActions(ctx context.Context) (reconcile.Result, error) {
 	}
 
 	// 2. Handle ISO eject scenario.
-	switch s.workflow.Spec.BootOptions.BootMode {
-	case v1alpha1.BootModeISO:
+	if s.workflow.Spec.BootOptions.BootMode == v1alpha1.BootModeISO {
 		if s.hardware == nil {
 			return reconcile.Result{}, errors.New("hardware is nil")
 		}

diff --git a/internal/deprecated/workflow/reconciler.go b/internal/deprecated/workflow/reconciler.go
@@ -227,22 +227,6 @@ func (r *Reconciler) processNewWorkflow(ctx context.Context, logger logr.Logger,
 		return reconcile.Result{Requeue: true}, nil
 	}
 
-	/*
-		// handle boot target if requested
-		switch stored.Spec.BootOptions.BootTarget {
-		case v1alpha1.BootTargetNetwork:
-			// netboot the hardware if requested
-			if stored.Spec.BootOptions.OneTimeNetboot {
-				stored.Status.State = v1alpha1.WorkflowStateWaiting
-				return reconcile.Result{Requeue: true}, err
-			}
-		case v1alpha1.BootTargetCDROM:
-			// TODO(jacobweinstock): add status if isoURL is not set
-			stored.Status.State = v1alpha1.WorkflowStateWaiting
-			return reconcile.Result{Requeue: true}, err
-		}
-	*/
-
 	stored.Status.State = v1alpha1.WorkflowStatePending
 	return reconcile.Result{}, nil
 }

diff --git a/internal/server/kubernetes_api_workflow.go b/internal/server/kubernetes_api_workflow.go
@@ -77,13 +77,10 @@ func (s *KubernetesBackedServer) GetWorkflowContexts(req *proto.WorkflowContextR
 		return err
 	}
 	for _, wf := range wflows {
-		// Don't serve Actions when in a v1alpha1.WorkflowStateWaiting state.
+		// Don't serve Actions when in a v1alpha1.WorkflowStatePreparing state.
 		// This is to prevent the worker from starting Actions before Workflow boot options are performed.
 		if wf.Spec.BootOptions.BootMode != "" && wf.Status.State == v1alpha1.WorkflowStatePreparing {
-			//if wf.Spec.BootOptions.ToggleAllowNetboot || wf.Spec.BootOptions.OneTimeNetboot {
-			//if wf.Status.State == v1alpha1.WorkflowStateWaiting {
 			continue
-			//}
 		}
 		if err := stream.Send(getWorkflowContext(wf)); err != nil {
 			return err
@@ -162,7 +159,7 @@ cont:
 		}
 		// Mark success on last action success
 		if wfContext.CurrentActionIndex+1 == wfContext.TotalNumberOfActions {
-			// wf.Status.State = v1alpha1.WorkflowState(proto.State_name[int32(wfContext.CurrentActionState)])
+			// Set the state to POST instead of Success to allow any post tasks to run.
 			wf.Status.State = v1alpha1.WorkflowStatePost
 		}
 	case proto.State_STATE_PENDING: