github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13366 from feihujiang/printValidContainersNames

Browse Source 
Print valid container names when the command not specify the container
This commit is contained in:
Abhi Shah 2015-09-03 16:36:27 -07:00
commit 0758a298db
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import (
"io" "io"
"os" "os"
"strconv" "strconv"
"strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@ -116,15 +117,18 @@ func RunLog(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
return err return err
} }
var container string // [-c CONTAINER]
if cmdutil.GetFlagString(cmd, "container") != "" { container := p.containerName
// [-c CONTAINER] if len(container) == 0 {
container = p.containerName
} else {
// [CONTAINER] (container as arg not flag) is supported as legacy behavior. See PR #10519 for more details. // [CONTAINER] (container as arg not flag) is supported as legacy behavior. See PR #10519 for more details.
if len(args) == 1 { if len(args) == 1 {
if len(pod.Spec.Containers) != 1 { if len(pod.Spec.Containers) != 1 {
return fmt.Errorf("POD %s has more than one container; please specify the container to print logs for", pod.ObjectMeta.Name) podContainersNames := []string{}
for _, container := range pod.Spec.Containers {
podContainersNames = append(podContainersNames, container.Name)
}
return fmt.Errorf("Pod %s has the following containers: %s; please specify the container to print logs for with -c", pod.ObjectMeta.Name, strings.Join(podContainersNames, ", "))
} }
container = pod.Spec.Containers[0].Name container = pod.Spec.Containers[0].Name
} else { } else {