Merge pull request #3688 from deads2k/show-pods

Merged by openshift-bot

Author: OpenShift Bot

pkg/api/graph/test/service-with-pod.yaml

@@ -0,0 +1,103 @@
+apiVersion: v1
+items:
+- apiVersion: v1
+  kind: Service
+  metadata:
+    creationTimestamp: 2015-07-13T19:36:04Z
+    labels:
+      template: ruby-helloworld-sample
+    name: frontend-app
+    namespace: example
+    resourceVersion: "32433"
+    selfLink: /api/v1/namespaces/example/services/frontend-app
+    uid: 667e1293-2996-11e5-b9e2-28d2447dc82b
+  spec:
+    clusterIP: 172.30.197.115
+    portalIP: 172.30.197.115
+    ports:
+    - nodePort: 0
+      port: 5432
+      protocol: TCP
+      targetPort: 8080
+    selector:
+      name: frontend
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}
+- apiVersion: v1
+  kind: Pod
+  metadata:
+    annotations:
+      kubernetes.io/created-by: '{"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"ReplicationController","namespace":"example","name":"frontend-app-1","uid":"666e12d7-2996-11e5-b9e2-28d2447dc82b","apiVersion":"v1","resourceVersion":"32416"}}'
+      openshift.io/scc: restricted
+    creationTimestamp: 2015-07-13T19:36:04Z
+    generateName: frontend-app-1-
+    labels:
+      deconflict: frontend.app
+      name: frontend
+      template: ruby-helloworld-sample
+    name: frontend-app-1-bjwh8
+    namespace: example
+    resourceVersion: "32467"
+    selfLink: /api/v1/namespaces/example/pods/frontend-app-1-bjwh8
+    uid: 669a3b5d-2996-11e5-b9e2-28d2447dc82b
+  spec:
+    containers:
+    - env:
+      - name: ADMIN_USERNAME
+        value: admin6TM
+      - name: ADMIN_PASSWORD
+        value: xImx1tHR
+      - name: MYSQL_ROOT_PASSWORD
+        value: rQHfVnTo
+      - name: MYSQL_DATABASE
+        value: root
+      image: openshift/ruby-hello-world
+      imagePullPolicy: IfNotPresent
+      name: ruby-helloworld
+      ports:
+      - containerPort: 8080
+        protocol: TCP
+      resources: {}
+      securityContext:
+        capabilities: {}
+        privileged: false
+        runAsUser: 1000060000
+        seLinuxOptions:
+          level: s0:c8,c2
+      terminationMessagePath: /dev/termination-log
+      volumeMounts:
+      - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+        name: default-token-mmv27
+        readOnly: true
+    dnsPolicy: ClusterFirst
+    host: deads-dev-01
+    imagePullSecrets:
+    - name: default-dockercfg-yr2e3
+    nodeName: deads-dev-01
+    restartPolicy: Always
+    serviceAccount: default
+    serviceAccountName: default
+    volumes:
+    - name: default-token-mmv27
+      secret:
+        secretName: default-token-mmv27
+  status:
+    conditions:
+    - status: "False"
+      type: Ready
+    containerStatuses:
+    - image: openshift/ruby-hello-world
+      imageID: ""
+      lastState: {}
+      name: ruby-helloworld
+      ready: false
+      restartCount: 0
+      state:
+        waiting:
+          reason: 'Image: openshift/ruby-hello-world is not ready on the node'
+    phase: Pending
+    startTime: 2015-07-13T19:36:05Z
+kind: List
+metadata: {}

pkg/api/kubegraph/edges.go

@@ -13,6 +13,8 @@ const (
 	// ExposedThroughServiceEdgeKind is an edge that goes from a podtemplatespec or a pod to service.
 	// The head should make the service's selector
 	ExposedThroughServiceEdgeKind = "ExposedThroughService"
+	// ManagedByRCEdgeKind goes from Pod to ReplicationController when the Pod satisfies the ReplicationController's label selector
+	ManagedByRCEdgeKind = "ManagedByRC"
 )
 
 // AddExposedPodTemplateSpecEdges ensures that a directed edge exists between a service and all the PodTemplateSpecs
@@ -66,3 +68,29 @@ func AddAllExposedPodEdges(g osgraph.MutableUniqueGraph) {
 		}
 	}
 }
+
+// AddManagedByRCPodEdges ensures that a directed edge exists between an RC and all the pods
+// in the graph that match the label selector
+func AddManagedByRCPodEdges(g osgraph.MutableUniqueGraph, rcNode *kubegraph.ReplicationControllerNode) {
+	if rcNode.Spec.Selector == nil {
+		return
+	}
+	query := labels.SelectorFromSet(rcNode.Spec.Selector)
+	for _, n := range g.(graph.Graph).NodeList() {
+		switch target := n.(type) {
+		case *kubegraph.PodNode:
+			if query.Matches(labels.Set(target.Labels)) {
+				g.AddEdge(target, rcNode, ManagedByRCEdgeKind)
+			}
+		}
+	}
+}
+
+// AddAllManagedByRCPodEdges calls AddManagedByRCPodEdges for every ServiceNode in the graph
+func AddAllManagedByRCPodEdges(g osgraph.MutableUniqueGraph) {
+	for _, node := range g.(graph.Graph).NodeList() {
+		if rcNode, ok := node.(*kubegraph.ReplicationControllerNode); ok {
+			AddManagedByRCPodEdges(g, rcNode)
+		}
+	}
+}

pkg/cmd/cli/describe/projectstatus.go

@@ -44,6 +44,7 @@ func (d *ProjectStatusDescriber) MakeGraph(namespace string) (osgraph.Graph, err
 	loaders := []GraphLoader{
 		&serviceLoader{namespace: namespace, lister: d.K},
 		&rcLoader{namespace: namespace, lister: d.K},
+		&podLoader{namespace: namespace, lister: d.K},
 		&bcLoader{namespace: namespace, lister: d.C},
 		&buildLoader{namespace: namespace, lister: d.C},
 		&isLoader{namespace: namespace, lister: d.C},
@@ -63,6 +64,8 @@ func (d *ProjectStatusDescriber) MakeGraph(namespace string) (osgraph.Graph, err
 	}
 
 	kubeedges.AddAllExposedPodTemplateSpecEdges(g)
+	kubeedges.AddAllExposedPodEdges(g)
+	kubeedges.AddAllManagedByRCPodEdges(g)
 	buildedges.AddAllInputOutputEdges(g)
 	buildedges.AddAllBuildEdges(g)
 	deployedges.AddAllTriggerEdges(g)
@@ -116,6 +119,17 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
 				}
 				printLines(out, indent, 1, describeRCInServiceGroup(rcNode)...)
 			}
+
+		pod:
+			for _, podNode := range service.FulfillingPods {
+				// skip pods that have been displayed in a roll-up of RCs and DCs (by implicit usage of RCs)
+				for _, coveredRC := range service.FulfillingRCs {
+					if g.EdgeBetween(podNode, coveredRC) != nil {
+						continue pod
+					}
+				}
+				printLines(out, indent, 1, describePodInServiceGroup(podNode)...)
+			}
 		}
 
 		for _, standaloneDC := range standaloneDCs {
@@ -139,8 +153,8 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
 
 			if hasUnresolvedImageStreamTag(g) {
 				fmt.Fprintln(out, "Warning: Some of your builds are pointing to image streams, but the administrator has not configured the integrated Docker registry (oadm registry).")
-
 			}
+
 			fmt.Fprintln(out, "To see more, use 'oc describe service <name>' or 'oc describe dc <name>'.")
 			fmt.Fprintln(out, "You can use 'oc get all' to see a list of other objects.")
 		}
@@ -214,6 +228,16 @@ func describeRCInServiceGroup(rcNode *kubegraph.ReplicationControllerNode) []str
 	return lines
 }
 
+func describePodInServiceGroup(podNode *kubegraph.PodNode) []string {
+	images := []string{}
+	for _, container := range podNode.Pod.Spec.Containers {
+		images = append(images, container.Image)
+	}
+
+	lines := []string{fmt.Sprintf("pod/%s runs %s", podNode.Pod.Name, strings.Join(images, ", "))}
+	return lines
+}
+
 func describeDeploymentConfigTrigger(dc *deployapi.DeploymentConfig) string {
 	if len(dc.Triggers) == 0 {
 		return "(manual)"
@@ -625,14 +649,14 @@ func (l *serviceLoader) AddToGraph(g osgraph.Graph) error {
 	return nil
 }
 
-type bcLoader struct {
+type rcLoader struct {
 	namespace string
-	lister    client.BuildConfigsNamespacer
-	items     []buildapi.BuildConfig
+	lister    kclient.ReplicationControllersNamespacer
+	items     []kapi.ReplicationController
 }
 
-func (l *bcLoader) Load() error {
-	list, err := l.lister.BuildConfigs(l.namespace).List(labels.Everything(), fields.Everything())
+func (l *rcLoader) Load() error {
+	list, err := l.lister.ReplicationControllers(l.namespace).List(labels.Everything())
 	if err != nil {
 		return err
 	}
@@ -641,9 +665,33 @@ func (l *bcLoader) Load() error {
 	return nil
 }
 
-func (l *bcLoader) AddToGraph(g osgraph.Graph) error {
+func (l *rcLoader) AddToGraph(g osgraph.Graph) error {
 	for i := range l.items {
-		buildgraph.EnsureBuildConfigNode(g, &l.items[i])
+		kubegraph.EnsureReplicationControllerNode(g, &l.items[i])
+	}
+
+	return nil
+}
+
+type podLoader struct {
+	namespace string
+	lister    kclient.PodsNamespacer
+	items     []kapi.Pod
+}
+
+func (l *podLoader) Load() error {
+	list, err := l.lister.Pods(l.namespace).List(labels.Everything(), fields.Everything())
+	if err != nil {
+		return err
+	}
+
+	l.items = list.Items
+	return nil
+}
+
+func (l *podLoader) AddToGraph(g osgraph.Graph) error {
+	for i := range l.items {
+		kubegraph.EnsurePodNode(g, &l.items[i])
 	}
 
 	return nil
@@ -698,14 +746,14 @@ func (l *dcLoader) AddToGraph(g osgraph.Graph) error {
 	return nil
 }
 
-type buildLoader struct {
+type bcLoader struct {
 	namespace string
-	lister    client.BuildsNamespacer
-	items     []buildapi.Build
+	lister    client.BuildConfigsNamespacer
+	items     []buildapi.BuildConfig
 }
 
-func (l *buildLoader) Load() error {
-	list, err := l.lister.Builds(l.namespace).List(labels.Everything(), fields.Everything())
+func (l *bcLoader) Load() error {
+	list, err := l.lister.BuildConfigs(l.namespace).List(labels.Everything(), fields.Everything())
 	if err != nil {
 		return err
 	}
@@ -714,22 +762,22 @@ func (l *buildLoader) Load() error {
 	return nil
 }
 
-func (l *buildLoader) AddToGraph(g osgraph.Graph) error {
+func (l *bcLoader) AddToGraph(g osgraph.Graph) error {
 	for i := range l.items {
-		buildgraph.EnsureBuildNode(g, &l.items[i])
+		buildgraph.EnsureBuildConfigNode(g, &l.items[i])
 	}
 
 	return nil
 }
 
-type rcLoader struct {
+type buildLoader struct {
 	namespace string
-	lister    kclient.ReplicationControllersNamespacer
-	items     []kapi.ReplicationController
+	lister    client.BuildsNamespacer
+	items     []buildapi.Build
 }
 
-func (l *rcLoader) Load() error {
-	list, err := l.lister.ReplicationControllers(l.namespace).List(labels.Everything())
+func (l *buildLoader) Load() error {
+	list, err := l.lister.Builds(l.namespace).List(labels.Everything(), fields.Everything())
 	if err != nil {
 		return err
 	}
@@ -738,9 +786,9 @@ func (l *rcLoader) Load() error {
 	return nil
 }
 
-func (l *rcLoader) AddToGraph(g osgraph.Graph) error {
+func (l *buildLoader) AddToGraph(g osgraph.Graph) error {
 	for i := range l.items {
-		kubegraph.EnsureReplicationControllerNode(g, &l.items[i])
+		buildgraph.EnsureBuildNode(g, &l.items[i])
 	}
 
 	return nil

pkg/cmd/cli/describe/projectstatus_test.go

@@ -113,6 +113,21 @@ func TestProjectStatus(t *testing.T) {
 				"To see more, use",
 			},
 		},
+		"service with pod": {
+			Path: "../../../../pkg/api/graph/test/service-with-pod.yaml",
+			Extra: []runtime.Object{
+				&projectapi.Project{
+					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},
+				},
+			},
+			ErrFn: func(err error) bool { return err == nil },
+			Contains: []string{
+				"In project example\n",
+				"service frontend-app",
+				"pod/frontend-app-1-bjwh8 runs openshift/ruby-hello-world",
+				"To see more, use",
+			},
+		},
 		"unstarted build": {
 			Path: "../../../../test/fixtures/app-scenarios/new-project-no-build.yaml",
 			Extra: []runtime.Object{