Merge pull request #18549 from mfojtik/oc-status-02

Automatic merge from submit-queue.

cli: fix status for standalone deployment

Fixing: https://bugzilla.redhat.com/show_bug.cgi?id=1540560

Author: openshift-merge-robot

pkg/oc/cli/describe/projectstatus.go

@@ -200,6 +200,9 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
 	standaloneDCs, coveredByDCs := graphview.AllDeploymentConfigPipelines(g, coveredNodes)
 	coveredNodes.Insert(coveredByDCs.List()...)
 
+	standaloneDeployments, coveredByDeployments := graphview.AllDeployments(g, coveredNodes)
+	coveredNodes.Insert(coveredByDeployments.List()...)
+
 	standaloneRCs, coveredByRCs := graphview.AllReplicationControllers(g, coveredNodes)
 	coveredNodes.Insert(coveredByRCs.List()...)
 
@@ -300,6 +303,12 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
 				return graphview.MaxRecentContainerRestartsForRC(g, rc)
 			})...)
 		}
+		for _, standaloneDeployment := range standaloneDeployments {
+			fmt.Fprintln(out)
+			printLines(out, indent, 0, describeDeploymentInServiceGroup(f, standaloneDeployment, func(rs *kubegraph.ReplicaSetNode) int32 {
+				return graphview.MaxRecentContainerRestartsForRS(g, rs)
+			})...)
+		}
 
 		for _, standaloneImage := range standaloneImages {
 			fmt.Fprintln(out)
@@ -312,6 +321,7 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
 			fmt.Fprintln(out)
 			printLines(out, indent, 0, describeRCInServiceGroup(f, standaloneRC.RC)...)
 		}
+
 		for _, standaloneRS := range standaloneRSs {
 			fmt.Fprintln(out)
 			printLines(out, indent, 0, describeRSInServiceGroup(f, standaloneRS.RS)...)
@@ -550,7 +560,7 @@ func (f namespacedFormatter) ResourceName(obj interface{}) string {
 	case *kubegraph.ReplicationControllerNode:
 		return namespaceNameWithType("rc", t.ReplicationController.Name, t.ReplicationController.Namespace, f.currentNamespace, f.hideNamespace)
 	case *kubegraph.ReplicaSetNode:
-		return namespaceNameWithType("rc", t.ReplicaSet.Name, t.ReplicaSet.Namespace, f.currentNamespace, f.hideNamespace)
+		return namespaceNameWithType("rs", t.ReplicaSet.Name, t.ReplicaSet.Namespace, f.currentNamespace, f.hideNamespace)
 	case *kubegraph.HorizontalPodAutoscalerNode:
 		return namespaceNameWithType("hpa", t.HorizontalPodAutoscaler.Name, t.HorizontalPodAutoscaler.Namespace, f.currentNamespace, f.hideNamespace)
 	case *kubegraph.StatefulSetNode:

pkg/oc/graph/kubegraph/nodes/nodes.go

@@ -117,33 +117,33 @@ func EnsureReplicationControllerNode(g osgraph.MutableUniqueGraph, rc *kapi.Repl
 
 // EnsureReplicaSetNode adds a graph node for the ReplicaSet if it does not already exist.
 func EnsureReplicaSetNode(g osgraph.MutableUniqueGraph, rs *extensions.ReplicaSet) *ReplicaSetNode {
-	rcNodeName := ReplicaSetNodeName(rs)
-	rcNode := osgraph.EnsureUnique(g,
-		rcNodeName,
+	rsNodeName := ReplicaSetNodeName(rs)
+	rsNode := osgraph.EnsureUnique(g,
+		rsNodeName,
 		func(node osgraph.Node) graph.Node {
 			return &ReplicaSetNode{node, rs, true}
 		},
 	).(*ReplicaSetNode)
 
-	rcSpecNode := EnsureReplicaSetSpecNode(g, &rs.Spec, rs.Namespace, rcNodeName)
-	g.AddEdge(rcNode, rcSpecNode, osgraph.ContainsEdgeKind)
+	rcSpecNode := EnsureReplicaSetSpecNode(g, &rs.Spec, rs.Namespace, rsNodeName)
+	g.AddEdge(rsNode, rcSpecNode, osgraph.ContainsEdgeKind)
 
-	return rcNode
+	return rsNode
 }
 
 func EnsureReplicaSetSpecNode(g osgraph.MutableUniqueGraph, rsSpec *extensions.ReplicaSetSpec, namespace string, ownerName osgraph.UniqueName) *ReplicaSetSpecNode {
-	rcSpecName := ReplicaSetSpecNodeName(rsSpec, ownerName)
-	rcSpecNode := osgraph.EnsureUnique(g,
-		rcSpecName,
+	rsSpecName := ReplicaSetSpecNodeName(rsSpec, ownerName)
+	rsSpecNode := osgraph.EnsureUnique(g,
+		rsSpecName,
 		func(node osgraph.Node) graph.Node {
 			return &ReplicaSetSpecNode{node, rsSpec, namespace, ownerName}
 		},
 	).(*ReplicaSetSpecNode)
 
-	ptSpecNode := EnsurePodTemplateSpecNode(g, &rsSpec.Template, namespace, rcSpecName)
-	g.AddEdge(rcSpecNode, ptSpecNode, osgraph.ContainsEdgeKind)
+	ptSpecNode := EnsurePodTemplateSpecNode(g, &rsSpec.Template, namespace, rsSpecName)
+	g.AddEdge(rsSpecNode, ptSpecNode, osgraph.ContainsEdgeKind)
 
-	return rcSpecNode
+	return rsSpecNode
 }
 
 func FindOrCreateSyntheticReplicationControllerNode(g osgraph.MutableUniqueGraph, rc *kapi.ReplicationController) *ReplicationControllerNode {