Fix docs YAML generation setting "kubernetes" for "swarm" #802
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
Due to a copy/paste error, commands annotated with "swarm" were incorrectly setting the "kubernetes" property. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added
kind/docs
status/2-code-review
process/cherry-pick
and removed
status/0-triage
labels
Codecov Report
@@ Coverage Diff @@
## master #802 +/- ##
=========================================
+ Coverage 50.89% 50.9% +<.01%
=========================================
Files 237 237
Lines 15338 15338
=========================================
+ Hits 7807 7808 +1
+ Misses 7029 7028 -1
Partials 502 502 |
dnephin
approved these changes
Jan 11, 2018
| @@ -123,7 +123,7 @@ func GenYamlCustom(cmd *cobra.Command, w io.Writer) error { | |||
| cliDoc.Kubernetes = true | |||
| } | |||
| if _, ok := curr.Annotations["swarm"]; ok && !cliDoc.Swarm { | |||
| cliDoc.Kubernetes = true | |||
| cliDoc.Swarm = true | |||
There was a problem hiding this comment.
Something still looks weird here.
It shouldn't need to check !cliDoc.Swarm because if it's true, setting it to true again doesn't hurt. Is this just an unnecessary statement that can be removed?
I guess all the checks above are the same, so maybe it was just copied?
There was a problem hiding this comment.
Yes, was looking at that as well, but didn't want to change without going through the whole logic. I can look at it for a follow-up 👍
mdlinville
approved these changes
Jan 11, 2018
|
author LGTM, let's merge this 👍 |
|
@andrewhsu this is needed in 18.01 |
|
Sorry guys... 😕 |
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.
Due to a copy/paste error, commands annotated with "swarm" were incorrectly setting the "kubernetes" property.
This was introduced in f1b1161 (#721)
- Description for the changelog
ping @silvin-lubecki @MistyHacks @dnephin PTAL