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

Fix kubectl log for single-container pods

Browse Source
This commit is contained in:
Jeff Lowdermilk 2015-03-27 12:26:00 -07:00
parent e4fc45c26f
commit 243de3a472
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,10 @@ func RunLog(f *Factory, out io.Writer, cmd *cobra.Command, args []string) error
var container string var container string
if len(args) == 1 { if len(args) == 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)
}
container = pod.Spec.Containers[0].Name
} else { } else {
container = args[1] container = args[1]
} }

2
pkg/kubectl/cmd/util/helpers.go
View File

@ -49,7 +49,7 @@ func CheckErr(err error) {
if client.IsUnexpectedStatusError(err) { if client.IsUnexpectedStatusError(err) {
glog.FatalDepth(1, fmt.Sprintf("Unexpected status received from server: %s", err.Error())) glog.FatalDepth(1, fmt.Sprintf("Unexpected status received from server: %s", err.Error()))
} }
glog.FatalDepth(1, fmt.Sprintf("Error: %s", err.Error())) glog.FatalDepth(1, fmt.Sprintf("Client error: %s", err.Error()))
} }
} }