fix(controller): Fix podSpecPatch
#5360
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
Signed-off-by: Alex Collins <[email protected]>
podSpecPatch
alexec
commented
Mar 11, 2021
| if !util.ValidateJsonStr(tmpl.PodSpecPatch, spec) { | ||
| return nil, errors.New("", "Invalid PodSpecPatch String") | ||
| if err := json.Unmarshal([]byte(tmpl.PodSpecPatch), &apiv1.PodSpec{}); err != nil { | ||
| return nil, fmt.Errorf("invalid podSpecPatch %q: %w", tmpl.PodSpecPatch, err) |
There was a problem hiding this comment.
better diagnostic output
alexec
commented
Mar 11, 2021
| @@ -1004,39 +1004,16 @@ func ConvertYAMLToJSON(str string) (string, error) { | |||
|
|
|||
| // PodSpecPatchMerge will do strategic merge the workflow level PodSpecPatch and template level PodSpecPatch | |||
| func PodSpecPatchMerge(wf *wfv1.Workflow, tmpl *wfv1.Template) (string, error) { | |||
There was a problem hiding this comment.
simplify merge to reduce bug
Signed-off-by: Alex Collins <[email protected]>
podSpecPatchpodSpecPatch
Signed-off-by: Alex Collins <[email protected]>
sarabala1979
approved these changes
Mar 12, 2021
simster7
pushed a commit
that referenced
this pull request
Mar 16, 2021
Signed-off-by: Alex Collins <[email protected]>
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.
No description provided.