fix: Make defaultWorkflow hooks work more than once (#11693)

argoproj · Sep 5, 2023 · f3f06f7 · f3f06f7
1 parent 27cd582
commit f3f06f7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/workflow/util/merge.go b/workflow/util/merge.go
@@ -17,8 +17,10 @@ func MergeTo(patch, target *wfv1.Workflow) error {
 	}
 
 	patchHooks := patch.Spec.Hooks
+	// Temporarily remove hooks as they don't merge
 	patch.Spec.Hooks = nil
 	patchWfBytes, err := json.Marshal(patch)
+	patch.Spec.Hooks = patchHooks
 	if err != nil {
 		return err
 	}