Skip to content

Commit

Permalink
Merge pull request docker-archive#387 from andrewhsu/d
Browse files Browse the repository at this point in the history
[18.01] Fix docs YAML generation setting "kubernetes" for "swarm"
  • Loading branch information
seemethere authored Jan 11, 2018
2 parents 03596f5 + f0f54bf commit ad7d1ef
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/cli/docs/yaml/yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down Expand Up @@ -208,7 +208,7 @@ func genFlagResult(flags *pflag.FlagSet) []cmdOption {
opt.Kubernetes = true
}
if _, ok := flag.Annotations["swarm"]; ok {
opt.Kubernetes = true
opt.Swarm = true
}

result = append(result, opt)
Expand Down

0 comments on commit ad7d1ef

Please sign in to comment.