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

add container names kubectl logs output

Browse Source 
Present a list of container names one can choose from.
This commit is contained in:
Julian Strobl 2016-01-11 15:26:44 +01:00
parent 6e15394171
commit 6cd10d4f87
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/registry/pod/strategy.go
View File

@ -22,6 +22,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"strconv" "strconv"
"strings"
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@ -231,6 +232,15 @@ func ResourceLocation(getter ResourceGetter, rt http.RoundTripper, ctx api.Conte
return loc, rt, nil return loc, rt, nil
} }
// getContainerNames returns a formatted string containing the container names
func getContainerNames(pod *api.Pod) string {
names := []string{}
for _, c := range pod.Spec.Containers {
names = append(names, c.Name)
}
return strings.Join(names, " ")
}
// LogLocation returns the log URL for a pod container. If opts.Container is blank // LogLocation returns the log URL for a pod container. If opts.Container is blank
// and only one container is present in the pod, that container is used. // and only one container is present in the pod, that container is used.
func LogLocation( func LogLocation(
@ -249,10 +259,14 @@ func LogLocation(
// If a container was provided, it must be valid // If a container was provided, it must be valid
container := opts.Container container := opts.Container
if len(container) == 0 { if len(container) == 0 {
if len(pod.Spec.Containers) == 1 { switch len(pod.Spec.Containers) {
case 1:
container = pod.Spec.Containers[0].Name container = pod.Spec.Containers[0].Name
} else { case 0:
return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name)) return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name))
default:
containerNames := getContainerNames(pod)
return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s, choose one of: [%s]", name, containerNames))
} }
} else { } else {
if !podHasContainerWithName(pod, container) { if !podHasContainerWithName(pod, container) {
@ -386,10 +400,14 @@ func streamLocation(
// Try to figure out a container // Try to figure out a container
// If a container was provided, it must be valid // If a container was provided, it must be valid
if container == "" { if container == "" {
if len(pod.Spec.Containers) == 1 { switch len(pod.Spec.Containers) {
case 1:
container = pod.Spec.Containers[0].Name container = pod.Spec.Containers[0].Name
} else { case 0:
return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name)) return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name))
default:
containerNames := getContainerNames(pod)
return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s, choose one of: [%s]", name, containerNames))
} }
} else { } else {
if !podHasContainerWithName(pod, container) { if !podHasContainerWithName(pod, container) {

2
pkg/registry/pod/strategy_test.go
View File

@ -129,7 +129,7 @@ func TestCheckLogLocation(t *testing.T) {
Status: api.PodStatus{}, Status: api.PodStatus{},
}, },
opts: &api.PodLogOptions{}, opts: &api.PodLogOptions{},
expectedErr: errors.NewBadRequest("a container name must be specified for pod test"), expectedErr: errors.NewBadRequest("a container name must be specified for pod test, choose one of: [container1 container2]"),
}, },
{ {
in: &api.Pod{ in: &api.Pod{