Fix docs YAML generation setting "kubernetes" for "swarm" #802
Conversation
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
left a comment
dnephin
left a comment
There was a problem hiding this comment.
LGTM
Easy to miss this kind of thing in a huge PR :)
| } | ||
| 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
left a comment
mdlinville
left a comment
There was a problem hiding this comment.
+1 applied this locally to build the 18.01 CLI refs
|
author LGTM, let's merge this 👍 |
|
@andrewhsu this is needed in 18.01 |
|
Sorry guys... 😕 |
Fix docs YAML generation setting "kubernetes" for "swarm" Upstream-commit: 41368a8 Component: cli
6 participants
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