Merge pull request #50617 from irfanurrehman/kubefed-doc-fix

Automatic merge from submit-queue (batch tested with PRs 50302, 50573, 50500, 50633, 50617) [Federation] Kubefed doc fix Fixes https://github.com/kubernetes/kubernetes/issues/50615 @kubernetes/sig-federation-bugs @madhusudancs, would it be of any reason to have separate code for kubefed for the version and options subcommands (rather then using ```kubectl.NewCmdVersion()``` and ```kubectl.NewCmdOptions```). I dont see the need, but I might be missing something. **What this PR does / why we need it**: Fixes https://github.com/kubernetes/kubernetes/issues/50615 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```NONE ```

Merge pull request #50617 from irfanurrehman/kubefed-doc-fix
b28b2dee · Kubernetes Submit Queue · GitHub · 7097b643 · f8a105c3 · b28b2dee
Commit b28b2dee authored Aug 14, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 14, 2017
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 2 deletions

BUILD federation/pkg/kubefed/BUILD +1 -0

kubefed.go federation/pkg/kubefed/kubefed.go +16 -2

No files found.
--- a/federation/pkg/kubefed/BUILD
+++ b/federation/pkg/kubefed/BUILD
@@ -28,6 +28,7 @@ go_library(
        "//pkg/kubectl/cmd/templates:go_default_library",
        "//pkg/kubectl/cmd/util:go_default_library",
        "//pkg/kubectl/resource:go_default_library",
+        "//pkg/util/i18n:go_default_library",
        "//vendor/github.com/golang/glog:go_default_library",
        "//vendor/github.com/spf13/cobra:go_default_library",
        "//vendor/github.com/spf13/pflag:go_default_library",

--- a/federation/pkg/kubefed/kubefed.go
+++ b/federation/pkg/kubefed/kubefed.go
@@ -26,10 +26,20 @@ import (
 	kubectl "k8s.io/kubernetes/pkg/kubectl/cmd"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	"k8s.io/kubernetes/pkg/util/i18n"

 	"github.com/spf13/cobra"
 )

+var (
+	kubefedVersionExample = templates.Examples(i18n.T(`
+		# Print the client and server versions for the current context
+		kubefed version`))
+	kubefedOptionsExample = templates.Examples(i18n.T(`
+		# Print flags inherited by all commands
+		kubefed options`))
+)
+
 // NewKubeFedCommand creates the `kubefed` command and its nested children.
 func NewKubeFedCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer, defaultServerImage, defaultEtcdImage string) *cobra.Command {
 	// Parent command to which all subcommands are added.
@@ -66,8 +76,12 @@ func NewKubeFedCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer, defa
 	}
 	templates.ActsAsRootCommand(cmds, filters, groups...)

-	cmds.AddCommand(kubectl.NewCmdVersion(f, out))
-	cmds.AddCommand(kubectl.NewCmdOptions(out))
+	cmdVersion := kubectl.NewCmdVersion(f, out)
+	cmdVersion.Example = kubefedVersionExample
+	cmds.AddCommand(cmdVersion)
+	cmdOptions := kubectl.NewCmdOptions(out)
+	cmdOptions.Example = kubefedOptionsExample
+	cmds.AddCommand(cmdOptions)

 	return cmds
 }