fix: Allow hooks to be specified in workflowDefaults #11214
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Any hook in workflowDefaults will cause `Error: merging object in json but data type is not struct, instead is: map`. This is down to how StrategicMergePatch handles maps of objects and limitations in merging them (a starting point for understading this is golang/go#33487). Instead, we copy the map of hooks, patch it out of the patch, perform the merge as before and then manually apply it. fixes: argoproj#11095 Signed-off-by: Alan Clucas <alan@clucas.org>
isubasinghe
approved these changes
Jun 21, 2023
terrytangyuan
approved these changes
Jun 21, 2023
tico24
pushed a commit
to tico24/argo-workflows
that referenced
this pull request
Jun 22, 2023
Signed-off-by: Tim Collins <tim@thecollins.team>
JPZ13
pushed a commit
to pipekit/argo-workflows
that referenced
this pull request
Jul 4, 2023
jeremyhager
pushed a commit
to jeremyhager/argo-workflows
that referenced
this pull request
Jul 7, 2023
Signed-off-by: Jeremy Hager <47301461+jeremyhager@users.noreply.github.com>
61 tasks
terrytangyuan
pushed a commit
that referenced
this pull request
Jul 19, 2023
3 tasks
6 tasks
6 tasks
dpadhiar
pushed a commit
to dpadhiar/argo-workflows
that referenced
this pull request
May 9, 2024
Signed-off-by: Dillen Padhiar <dillen_padhiar@intuit.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Any hook in workflowDefaults will cause
Error: merging object in json but data type is not struct, instead is: map.This is down to how StrategicMergePatch handles maps of objects and limitations in merging them (a starting point for understading this is golang/go#33487).
Instead, we copy the map of hooks, patch it out of the patch, perform the merge as before and then manually apply it.
Fixes: #11095
Verification
There is a new test that covers the merging. Verified by changing workflowDefaults to add a hook and checking that I could run the resulting workflow.