Merge pull request #18953 from juanvallejo/jvallejo/group-services-w-same-selector

Automatic merge from submit-queue (batch tested with PRs 18953, 18992).

group services w same selectors in `oc status`

Fixes #7503

**Before**
```bash
$ oc status
In project My Project (myproject) on server https://127.0.0.1:8443

svc/foo - foo.com
  dc/myapp deploys istag/myapp:latest <-
    bc/myapp source builds https://github.com/juanvallejo/myapp on openshift/nodejs:8
    deployment #1 deployed 7 minutes ago - 1 pod

svc/bar - 172.30.75.107:8080
  dc/myapp deploys istag/myapp:latest <-
    bc/myapp source builds https://github.com/juanvallejo/myapp on openshift/nodejs:8
    deployment #1 deployed 7 minutes ago - 1 pod
...
```

**After**
```bash
$ oc status
In project My Project (myproject) on server https://127.0.0.1:8443

svc/bar - 172.30.75.107:8080
svc/foo - foo.com
  dc/myapp deploys istag/myapp:latest <-
    bc/myapp source builds https://github.com/juanvallejo/myapp on openshift/nodejs:8
    deployment #1 deployed 7 hours ago - 1 pod
...
```

cc @soltysh @deads2k

Author: openshift-merge-robot

pkg/oc/cli/describe/projectstatus.go

@@ -11,6 +11,7 @@ import (
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	kapps "k8s.io/kubernetes/pkg/apis/apps"
@@ -164,6 +165,22 @@ func (d *ProjectStatusDescriber) MakeGraph(namespace string) (osgraph.Graph, set
 	return g, forbiddenResources, nil
 }
 
+// createSelector receives a map of strings and
+// converts it into a labels.Selector
+func createSelector(values map[string]string) labels.Selector {
+	selector := labels.NewSelector()
+	for k, v := range values {
+		req, err := labels.NewRequirement(k, "=", []string{v})
+		if err != nil {
+			continue
+		}
+
+		selector = selector.Add(*req)
+	}
+
+	return selector
+}
+
 // Describe returns the description of a project
 func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error) {
 	var f formatter = namespacedFormatter{}
@@ -195,9 +212,25 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
 
 	coveredNodes := graphview.IntSet{}
 
-	services, coveredByServices := graphview.AllServiceGroups(g, coveredNodes)
+	allServices, coveredByServices := graphview.AllServiceGroups(g, coveredNodes)
 	coveredNodes.Insert(coveredByServices.List()...)
 
+	// services grouped by selector
+	servicesBySelector := map[string][]graphview.ServiceGroup{}
+	services := []graphview.ServiceGroup{}
+
+	// group services with identical selectors
+	for _, svc := range allServices {
+		selector := createSelector(svc.Service.Spec.Selector)
+		if _, seen := servicesBySelector[selector.String()]; seen {
+			servicesBySelector[selector.String()] = append(servicesBySelector[selector.String()], svc)
+			continue
+		}
+
+		services = append(services, svc)
+		servicesBySelector[selector.String()] = []graphview.ServiceGroup{}
+	}
+
 	standaloneDCs, coveredByDCs := graphview.AllDeploymentConfigPipelines(g, coveredNodes)
 	coveredNodes.Insert(coveredByDCs.List()...)
 
@@ -243,6 +276,26 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
 			sort.Sort(exposedRoutes(exposes))
 
 			fmt.Fprintln(out)
+
+			// print services that should be grouped with this service based on matching selectors
+			selector := createSelector(service.Service.Spec.Selector)
+			groupedServices := servicesBySelector[selector.String()]
+			for _, groupedSvc := range groupedServices {
+				if !groupedSvc.Service.Found() {
+					continue
+				}
+
+				grouppedLocal := namespacedFormatter{currentNamespace: service.Service.Namespace}
+
+				var grouppedExposes []string
+				for _, routeNode := range groupedSvc.ExposingRoutes {
+					grouppedExposes = append(grouppedExposes, describeRouteInServiceGroup(grouppedLocal, routeNode)...)
+				}
+				sort.Sort(exposedRoutes(grouppedExposes))
+
+				printLines(out, "", 0, describeServiceInServiceGroup(f, groupedSvc, grouppedExposes...)...)
+			}
+
 			printLines(out, "", 0, describeServiceInServiceGroup(f, service, exposes...)...)
 
 			for _, dcPipeline := range service.DeploymentConfigPipelines {