github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #25305 from AdoHe/pod_ip 

add ip to pod wide output
pull/6/head
Jeff Lowdermilk 2016-05-13 15:05:30 -07:00
parent 1169743223 e830d03ffc
commit 8329b7d624
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

@ -532,6 +532,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)
@ -540,8 +541,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

@ -634,7 +634,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
@ -1780,7 +1785,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"}