From 8a7709de9b7b7e7978b1c901f0f14edc19f07ede Mon Sep 17 00:00:00 2001 From: Irfan Ur Rehman Date: Mon, 14 Aug 2017 19:54:23 +0530 Subject: [PATCH 1/2] [Federation] Kubefed doc fix --- federation/pkg/kubefed/kubefed.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/federation/pkg/kubefed/kubefed.go b/federation/pkg/kubefed/kubefed.go index 8676e2ae64..d7d1055dcd 100644 --- 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 } From f8a105c32ac0e5a0c6881b640db5833e3909cc46 Mon Sep 17 00:00:00 2001 From: Irfan Ur Rehman Date: Mon, 14 Aug 2017 19:54:55 +0530 Subject: [PATCH 2/2] [Federation] Autogenerated file changes for kubefed doc fix --- federation/pkg/kubefed/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/federation/pkg/kubefed/BUILD b/federation/pkg/kubefed/BUILD index 5d77c81f77..a2e661ddf2 100644 --- 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",