Merge pull request #985 from wzshiming/fix/stage-delete-and-immediate

Fix updates for both delete and immediateNextStage
kubernetes-sigs · Mar 6, 2024 · 1ad9796 · 1ad9796
2 parents b441343 + 7f04544
commit 1ad9796
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pkg/kwok/controllers/node_controller.go b/pkg/kwok/controllers/node_controller.go
@@ -455,6 +455,7 @@ func (c *NodeController) playStage(ctx context.Context, node *corev1.Node, stage
 		if err != nil {
 			return shouldRetry(err), fmt.Errorf("failed to delete node %s: %w", node.Name, err)
 		}
+		result = nil
 	} else if next.StatusTemplate != "" {
 		patch, err = c.computeStatusPatch(node, next.StatusTemplate)
 		if err != nil {

diff --git a/pkg/kwok/controllers/pod_controller.go b/pkg/kwok/controllers/pod_controller.go
@@ -350,10 +350,9 @@ func (c *PodController) playStage(ctx context.Context, pod *corev1.Pod, stage *L
 	if next.Delete {
 		err = c.deleteResource(ctx, pod)
 		if err != nil {
-			if err != nil {
-				return shouldRetry(err), fmt.Errorf("failed to delete pod %s: %w", pod.Name, err)
-			}
+			return shouldRetry(err), fmt.Errorf("failed to delete pod %s: %w", pod.Name, err)
 		}
+		result = nil
 	} else if next.StatusTemplate != "" {
 		patch, err = c.computeStatusPatch(pod, next.StatusTemplate)
 		if err != nil {

diff --git a/pkg/kwok/controllers/stage_controller.go b/pkg/kwok/controllers/stage_controller.go
@@ -332,6 +332,7 @@ func (c *StageController) playStage(ctx context.Context, resource *unstructured.
 		if err != nil {
 			return shouldRetry(err), fmt.Errorf("failed to delete resource %s: %w", resource.GetName(), err)
 		}
+		result = nil
 	} else if next.StatusTemplate != "" {
 		patch, err = c.computeStatusPatch(resource, next.StatusTemplate)
 		if err != nil {