github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

add ip to pod wide output

Browse Source
This commit is contained in:
AdoHe 2016-05-12 00:30:25 -04:00
parent c65a6a431e
commit e830d03ffc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,6 +515,7 @@ func Example_printPodWithWideFormat() {
{Ready: true, RestartCount: 3, State: api.ContainerState{Running: &api.ContainerStateRunning{}}},
{RestartCount: 3},
},
PodIP: "10.1.1.3",
},
}
mapper, _ := f.Object(false)
@ -523,8 +524,8 @@ func Example_printPodWithWideFormat() {
fmt.Printf("Unexpected error: %v", err)
}
// Output:
// NAME READY STATUS RESTARTS AGE NODE
// test1 1/2 podPhase 6 10y kubernetes-minion-abcd
// NAME READY STATUS RESTARTS AGE IP NODE
// test1 1/2 podPhase 6 10y 10.1.1.3 kubernetes-minion-abcd
}
func Example_printPodWithShowLabels() {

9
pkg/kubectl/resource_printer.go
View File

@ -633,7 +633,12 @@ func printPodBase(pod *api.Pod, w io.Writer, options PrintOptions) error {
if options.Wide {
nodeName := pod.Spec.NodeName
if _, err := fmt.Fprintf(w, "\t%s",
podIP := pod.Status.PodIP
if podIP == "" {
podIP = "<none>"
}
if _, err := fmt.Fprintf(w, "\t%s\t%s",
podIP,
nodeName,
); err != nil {
return err
@ -1783,7 +1788,7 @@ func formatLabelHeaders(columnLabels []string) []string {
func formatWideHeaders(wide bool, t reflect.Type) []string {
if wide {
if t.String() == "*api.Pod" || t.String() == "*api.PodList" {
return []string{"NODE"}
return []string{"IP", "NODE"}
}
if t.String() == "*api.ReplicationController" || t.String() == "*api.ReplicationControllerList" {
return []string{"CONTAINER(S)", "IMAGE(S)", "SELECTOR"}