github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

improve some error messages.

Browse Source
This commit is contained in:
Brendan Burns
2016-08-29 22:27:22 -07:00
parent 956501b1f0
commit 155fb9f4be
4 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/logs.go
View File

@@ -53,6 +53,10 @@ var (
kubectl logs --since=1h nginx`)
)
const (
logsUsageStr = "expected 'exec <pod-name> [container-name]'.\n<pod-name> is a required parameter for the logs command"
)
type LogsOptions struct {
Namespace string
ResourceArg string
@@ -111,17 +115,17 @@ func (o *LogsOptions) Complete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Com
containerName := cmdutil.GetFlagString(cmd, "container")
switch len(args) {
case 0:
return cmdutil.UsageError(cmd, "POD is required for logs")
return cmdutil.UsageError(cmd, logsUsageStr)
case 1:
o.ResourceArg = args[0]
case 2:
if cmd.Flag("container").Changed {
return cmdutil.UsageError(cmd, "only one of -c, [CONTAINER] arg is allowed")
return cmdutil.UsageError(cmd, "only one of -c or an inline [CONTAINER] arg is allowed")
}
o.ResourceArg = args[0]
containerName = args[1]
default:
return cmdutil.UsageError(cmd, "logs POD [-c CONTAINER]")
return cmdutil.UsageError(cmd, logsUsageStr)
}
var err error
o.Namespace, _, err = f.DefaultNamespace()