[JENKINS-58405] Backward compatibility for yaml field merge #538
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
Added a yamlMergeStrategy field to PodTemplate/PodTemplateStep in order to control how yaml field is handled across inheritance of pod templates. Defaults to "override" in order to be backward compatible.
jglick
reviewed
Jul 9, 2019
src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/yaml/YamlMergeStrategy.java
Outdated
Show resolved
Hide resolved
src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/yaml/Overrides.java
Outdated
Show resolved
Hide resolved
src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java
Outdated
Show resolved
Hide resolved
| Defines how the raw yaml field gets merged with yaml definitions from inherited pod templates. | ||
|
|
||
| <ul> | ||
| <li>Override: The yaml definitions from inherited pod templates are completely overridden by the current yaml field.</li> |
There was a problem hiding this comment.
Put this documentation in help.html for each option.
There was a problem hiding this comment.
Hum... does it work with dropdownDescriptorSelector ? The only place where I've seen this pattern being used was with descriptorRadioList. I could probably pull the description for each implementation in its own config page though.
There was a problem hiding this comment.
Not sure. Try config.jelly plus f:description. It is possible f:dropdownDescriptorSelector does not yet honor help.html, I do not recall.
There was a problem hiding this comment.
Yes, this is what I ended up doing in e01f122
src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/mergeYaml.groovy
Show resolved
Hide resolved
jglick
reviewed
Jul 9, 2019
src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/yaml/YamlMergeStrategy.java
Show resolved
Hide resolved
jglick
approved these changes
Jul 9, 2019
src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/yaml/YamlMergeStrategy.java
Show resolved
Hide resolved
| Defines how the raw yaml field gets merged with yaml definitions from inherited pod templates. | ||
|
|
||
| <ul> | ||
| <li>Override: The yaml definitions from inherited pod templates are completely overridden by the current yaml field.</li> |
Vlatombe
added a commit
to Vlatombe/kubernetes-plugin
that referenced
this pull request
Jul 10, 2019
[JENKINS-58405] Backward compatibility for yaml field merge
|
Amends #449 right? |
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.
Added a yamlMergeStrategy field to PodTemplate/PodTemplateStep in order
to control how yaml field is handled across inheritance of pod
templates. Defaults to "override" in order to be backward compatible.