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

Make describeEvents DescribeEvents

pull/6/head
derekwaynecarr 2015-04-21 00:24:12 -04:00
parent 9dcf3e0a33
commit 7638107f8b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/describe.go
View File

@ -237,7 +237,7 @@ func (d *PodDescriber) Describe(namespace, name string) (string, error) {
if err2 == nil && len(events.Items) > 0 { if err2 == nil && len(events.Items) > 0 {
return tabbedString(func(out io.Writer) error { return tabbedString(func(out io.Writer) error {
fmt.Fprintf(out, "Pod '%v': error '%v', but found events.\n", name, err) fmt.Fprintf(out, "Pod '%v': error '%v', but found events.\n", name, err)
describeEvents(events, out) DescribeEvents(events, out)
return nil return nil
}) })
} }
@ -279,7 +279,7 @@ func describePod(pod *api.Pod, rcs []api.ReplicationController, events *api.Even
} }
} }
if events != nil { if events != nil {
describeEvents(events, out) DescribeEvents(events, out)
} }
return nil return nil
}) })
@ -410,7 +410,7 @@ func describeReplicationController(controller *api.ReplicationController, events
fmt.Fprintf(out, "Replicas:\t%d current / %d desired\n", controller.Status.Replicas, controller.Spec.Replicas) fmt.Fprintf(out, "Replicas:\t%d current / %d desired\n", controller.Status.Replicas, controller.Spec.Replicas)
fmt.Fprintf(out, "Pods Status:\t%d Running / %d Waiting / %d Succeeded / %d Failed\n", running, waiting, succeeded, failed) fmt.Fprintf(out, "Pods Status:\t%d Running / %d Waiting / %d Succeeded / %d Failed\n", running, waiting, succeeded, failed)
if events != nil { if events != nil {
describeEvents(events, out) DescribeEvents(events, out)
} }
return nil return nil
}) })
@ -460,7 +460,7 @@ func describeService(service *api.Service, endpoints *api.Endpoints, events *api
fmt.Fprintf(out, "Endpoints:\t%s\n", formatEndpoints(endpoints)) fmt.Fprintf(out, "Endpoints:\t%s\n", formatEndpoints(endpoints))
fmt.Fprintf(out, "Session Affinity:\t%s\n", service.Spec.SessionAffinity) fmt.Fprintf(out, "Session Affinity:\t%s\n", service.Spec.SessionAffinity)
if events != nil { if events != nil {
describeEvents(events, out) DescribeEvents(events, out)
} }
return nil return nil
}) })
@ -550,13 +550,13 @@ func describeNode(node *api.Node, pods []*api.Pod, events *api.EventList) (strin
fmt.Fprintf(out, " %s\n", pod.Name) fmt.Fprintf(out, " %s\n", pod.Name)
} }
if events != nil { if events != nil {
describeEvents(events, out) DescribeEvents(events, out)
} }
return nil return nil
}) })
} }
func describeEvents(el *api.EventList, w io.Writer) { func DescribeEvents(el *api.EventList, w io.Writer) {
if len(el.Items) == 0 { if len(el.Items) == 0 {
fmt.Fprint(w, "No events.") fmt.Fprint(w, "No events.")
return return