new file mode 100644

@@ -0,0 +1,39 @@

+package graphview

+

+import (

+	osgraph "github.com/openshift/origin/pkg/api/graph"

+	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"

+)

+

+type Pod struct {

+	Pod *kubegraph.PodNode

+}

+

+// AllPods returns all Pods and the set of covered NodeIDs

+func AllPods(g osgraph.Graph, excludeNodeIDs IntSet) ([]Pod, IntSet) {

+	covered := IntSet{}

+	pods := []Pod{}

+

+	for _, uncastNode := range g.NodesByKind(kubegraph.PodNodeKind) {

+		if excludeNodeIDs.Has(uncastNode.ID()) {

+			continue

+		}

+

+		pod, covers := NewPod(g, uncastNode.(*kubegraph.PodNode))

+		covered.Insert(covers.List()...)

+		pods = append(pods, pod)

+	}

+

+	return pods, covered

+}

+

+// NewPod returns the Pod and a set of all the NodeIDs covered by the Pod

+func NewPod(g osgraph.Graph, podNode *kubegraph.PodNode) (Pod, IntSet) {

+	covered := IntSet{}

+	covered.Insert(podNode.ID())

+

+	podView := Pod{}

+	podView.Pod = podNode

+

+	return podView, covered

+}

@@ -97,6 +97,11 @@ func NewServiceGroup(g osgraph.Graph, serviceNode *kubegraph.ServiceNode) (Servi

 		service.ReplicationControllers = append(service.ReplicationControllers, rcView)

 	}

+	for _, fulfillingPod := range service.FulfillingPods {

+		_, podCovers := NewPod(g, fulfillingPod)

+		covered.Insert(podCovers.List()...)

+	}

+

 	return service, covered

 }

@@ -152,6 +152,9 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error

 	standaloneImages, coveredByImages := graphview.AllImagePipelinesFromBuildConfig(g, coveredNodes)

 	coveredNodes.Insert(coveredByImages.List()...)

+	standalonePods, coveredByPods := graphview.AllPods(g, coveredNodes)

+	coveredNodes.Insert(coveredByPods.List()...)

+

 	return tabbedString(func(out *tabwriter.Writer) error {

 		indent := "  "

 		if allNamespaces {

@@ -218,6 +221,15 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error

 			printLines(out, indent, 0, describeRCInServiceGroup(f, standaloneRC.RC)...)

 		}

+		monopods, err := filterBoringPods(standalonePods)

+		if err != nil {

+			return err

+		}

+		for _, monopod := range monopods {

+			fmt.Fprintln(out)

+			printLines(out, indent, 0, describeMonopod(f, monopod.Pod)...)

+		}

+

 		allMarkers := osgraph.Markers{}

 		allMarkers = append(allMarkers, createForbiddenMarkers(forbiddenResources)...)

 		for _, scanner := range getMarkerScanners(d.LogsCommandName, d.SecurityPolicyCommandFormat, d.SetProbeCommandName) {

@@ -502,6 +514,16 @@ func describePodInServiceGroup(f formatter, podNode *kubegraph.PodNode) []string

 	return lines

 }

+func describeMonopod(f formatter, podNode *kubegraph.PodNode) []string {

+	images := []string{}

+	for _, container := range podNode.Pod.Spec.Containers {

+		images = append(images, container.Image)

+	}

+

+	lines := []string{fmt.Sprintf("%s runs %s", f.ResourceName(podNode), strings.Join(images, ", "))}

+	return lines

+}

+

 // exposedRoutes orders strings by their leading prefix (https:// -> http:// other prefixes), then by

 // the shortest distance up to the first space (indicating a break), then alphabetically:

 //

@@ -1044,6 +1066,30 @@ func describeServicePorts(spec kapi.ServiceSpec) string {

 	}

 }

+func filterBoringPods(pods []graphview.Pod) ([]graphview.Pod, error) {

+	monopods := []graphview.Pod{}

+

+	for _, pod := range pods {

+		actualPod, ok := pod.Pod.Object().(*kapi.Pod)

+		if !ok {

+			continue

+		}

+		meta, err := kapi.ObjectMetaFor(actualPod)

+		if err != nil {

+			return nil, err

+		}

+		_, isDeployerPod := meta.Labels[deployapi.DeployerPodForDeploymentLabel]

+		_, isBuilderPod := meta.Annotations[buildapi.BuildAnnotation]

+		isFinished := actualPod.Status.Phase == kapi.PodSucceeded || actualPod.Status.Phase == kapi.PodFailed

+		if isDeployerPod || isBuilderPod || isFinished {

+			continue

+		}

+		monopods = append(monopods, pod)

+	}

+

+	return monopods, nil

+}

+

 // GraphLoader is a stateful interface that provides methods for building the nodes of a graph

 type GraphLoader interface {

 	// Load is responsible for gathering and saving the objects this GraphLoader should AddToGraph

@@ -293,6 +293,20 @@ func TestProjectStatus(t *testing.T) {

 				`View details with 'oc describe <resource>/<name>' or list everything with 'oc get all'.`,

 			},

 		},

+		"monopod": {

+			Path: "../../../../test/fixtures/app-scenarios/k8s-lonely-pod.json",

+			Extra: []runtime.Object{

+				&projectapi.Project{

+					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

+				},

+			},

+			ErrFn: func(err error) bool { return err == nil },

+			Contains: []string{

+				"In project example on server https://example.com:8443\n",

+				"pod/lonely-pod runs openshift/hello-openshift",

+				"You have no services, deployment configs, or build configs.",

+			},

+		},

 	}

 	oldTimeFn := timeNowFn

 	defer func() { timeNowFn = oldTimeFn }()