From b4ca15dfcea152ef878b7db529021a3b73543fff Mon Sep 17 00:00:00 2001
From: Eric Tune <etune@google.com>
Date: Fri, 25 Sep 2015 21:45:18 -0700
Subject: [PATCH] Print namespace when asked for job.

Also print multiple containers if there happen to be multiple.
---
 pkg/kubectl/resource_printer.go | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go
index 6191dd4cdd3..97d05591771 100644
--- a/pkg/kubectl/resource_printer.go
+++ b/pkg/kubectl/resource_printer.go
@@ -724,13 +724,20 @@ func printReplicationControllerList(list *api.ReplicationControllerList, w io.Wr
 }
 
 func printJob(job *experimental.Job, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+	name := job.Name
+	namespace := job.Namespace
 	containers := job.Spec.Template.Spec.Containers
 	var firstContainer api.Container
 	if len(containers) > 0 {
-		firstContainer = containers[0]
+		firstContainer, containers = containers[0], containers[1:]
+	}
+	if withNamespace {
+		if _, err := fmt.Fprintf(w, "%s\t", namespace); err != nil {
+			return err
+		}
 	}
 	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%d\n",
-		job.Name,
+		name,
 		firstContainer.Name,
 		firstContainer.Image,
 		labels.FormatLabels(job.Spec.Selector),
@@ -738,6 +745,24 @@ func printJob(job *experimental.Job, w io.Writer, withNamespace bool, wide bool,
 	if err != nil {
 		return err
 	}
+	if _, err := fmt.Fprint(w, appendLabels(job.Labels, columnLabels)); err != nil {
+		return err
+	}
+
+	// Lay out all the other containers on separate lines.
+	extraLinePrefix := "\t"
+	if withNamespace {
+		extraLinePrefix = "\t\t"
+	}
+	for _, container := range containers {
+		_, err := fmt.Fprintf(w, "%s%s\t%s\t%s\t%s", extraLinePrefix, container.Name, container.Image, "", "")
+		if err != nil {
+			return err
+		}
+		if _, err := fmt.Fprint(w, appendLabelTabs(columnLabels)); err != nil {
+			return err
+		}
+	}
 	return nil
 }