github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2682 from mfojtik/cmd_public

Browse Source 
Export kubectl/cmd methods
This commit is contained in:
Clayton Coleman 2014-12-03 08:52:04 -06:00
commit ff173d013a
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubectl/cmd/cmd.go
View File

@ -123,7 +123,10 @@ func runHelp(cmd *cobra.Command, args []string) {
cmd.Help() cmd.Help()
} }
func getKubeNamespace(cmd *cobra.Command) string { // GetKubeNamespace returns the value of the namespace a
// user provided on the command line or use the default
// namespace.
func GetKubeNamespace(cmd *cobra.Command) string {
result := api.NamespaceDefault result := api.NamespaceDefault
if ns := GetFlagString(cmd, "namespace"); len(ns) > 0 { if ns := GetFlagString(cmd, "namespace"); len(ns) > 0 {
result = ns result = ns
@ -140,10 +143,10 @@ func getKubeNamespace(cmd *cobra.Command) string {
return result return result
} }
// getExplicitKubeNamespace returns the value of the namespace a // GetExplicitKubeNamespace returns the value of the namespace a
// user explicitly provided on the command line, or false if no // user explicitly provided on the command line, or false if no
// such namespace was specified. // such namespace was specified.
func getExplicitKubeNamespace(cmd *cobra.Command) (string, bool) { func GetExplicitKubeNamespace(cmd *cobra.Command) (string, bool) {
if ns := GetFlagString(cmd, "namespace"); len(ns) > 0 { if ns := GetFlagString(cmd, "namespace"); len(ns) > 0 {
return ns, true return ns, true
} }

2
pkg/kubectl/cmd/create.go
View File

@ -49,7 +49,7 @@ Examples:
// use the default namespace if not specified, or check for conflict with the file's namespace // use the default namespace if not specified, or check for conflict with the file's namespace
if len(namespace) == 0 { if len(namespace) == 0 {
namespace = getKubeNamespace(cmd) namespace = GetKubeNamespace(cmd)
} else { } else {
err = CompareNamespaceFromFile(cmd, namespace) err = CompareNamespaceFromFile(cmd, namespace)
checkErr(err) checkErr(err)

5
pkg/kubectl/cmd/log.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package cmd package cmd
import ( import (
"github.com/spf13/cobra"
"io" "io"
"github.com/spf13/cobra"
) )
func (f *Factory) NewCmdLog(out io.Writer) *cobra.Command { func (f *Factory) NewCmdLog(out io.Writer) *cobra.Command {
@ -30,7 +31,7 @@ func (f *Factory) NewCmdLog(out io.Writer) *cobra.Command {
usageError(cmd, "<pod> and <container> are required for log") usageError(cmd, "<pod> and <container> are required for log")
} }
namespace := getKubeNamespace(cmd) namespace := GetKubeNamespace(cmd)
client, err := f.ClientBuilder.Client() client, err := f.ClientBuilder.Client()
checkErr(err) checkErr(err)

8
pkg/kubectl/cmd/resource.go
View File

@ -37,7 +37,7 @@ func ResourceFromArgsOrFile(cmd *cobra.Command, args []string, filename string,
if len(args) == 2 { if len(args) == 2 {
resource := kubectl.ExpandResourceShortcut(args[0]) resource := kubectl.ExpandResourceShortcut(args[0])
namespace = getKubeNamespace(cmd) namespace = GetKubeNamespace(cmd)
name = args[1] name = args[1]
if len(name) == 0 || len(resource) == 0 { if len(name) == 0 || len(resource) == 0 {
usageError(cmd, "Must specify filename or command line params") usageError(cmd, "Must specify filename or command line params")
@ -75,7 +75,7 @@ func ResourceFromArgs(cmd *cobra.Command, args []string, mapper meta.RESTMapper)
} }
resource := kubectl.ExpandResourceShortcut(args[0]) resource := kubectl.ExpandResourceShortcut(args[0])
namespace = getKubeNamespace(cmd) namespace = GetKubeNamespace(cmd)
name = args[1] name = args[1]
if len(name) == 0 || len(resource) == 0 { if len(name) == 0 || len(resource) == 0 {
usageError(cmd, "Must provide resource and name command line params") usageError(cmd, "Must provide resource and name command line params")
@ -102,7 +102,7 @@ func ResourceOrTypeFromArgs(cmd *cobra.Command, args []string, mapper meta.RESTM
usageError(cmd, "Must provide resource or a resource and name as command line params") usageError(cmd, "Must provide resource or a resource and name as command line params")
} }
namespace = getKubeNamespace(cmd) namespace = GetKubeNamespace(cmd)
if len(args) == 2 { if len(args) == 2 {
name = args[1] name = args[1]
if len(name) == 0 { if len(name) == 0 {
@ -154,7 +154,7 @@ func ResourceFromFile(filename string, typer runtime.ObjectTyper, mapper meta.RE
// or via the default namespace file does not match the namespace of an input file. This // or via the default namespace file does not match the namespace of an input file. This
// prevents a user from unintentionally updating the wrong namespace. // prevents a user from unintentionally updating the wrong namespace.
func CompareNamespaceFromFile(cmd *cobra.Command, namespace string) error { func CompareNamespaceFromFile(cmd *cobra.Command, namespace string) error {
defaultNamespace := getKubeNamespace(cmd) defaultNamespace := GetKubeNamespace(cmd)
if len(namespace) > 0 { if len(namespace) > 0 {
if defaultNamespace != namespace { if defaultNamespace != namespace {
return fmt.Errorf("the namespace from the provided file %q does not match the namespace %q. You must pass '--namespace=%s' to perform this operation.", namespace, defaultNamespace, namespace) return fmt.Errorf("the namespace from the provided file %q does not match the namespace %q. You must pass '--namespace=%s' to perform this operation.", namespace, defaultNamespace, namespace)