group services w same selectors in oc status

Author: juanvallejo

pkg/oc/cli/describe/projectstatus.go

@@ -164,6 +164,37 @@ func (d *ProjectStatusDescriber) MakeGraph(namespace string) (osgraph.Graph, set
 	return g, forbiddenResources, nil
 }
 
+func selectorEquals(A, B map[string]string) bool {
+	if len(A) == 0 && len(B) == 0 {
+		return true
+	}
+	if len(A) == 0 {
+		return false
+	}
+
+	for Ak, Av := range A {
+		if Bv, exists := B[Ak]; !exists || Av != Bv {
+			return false
+		}
+	}
+
+	return true
+}
+
+func containsSelector(selector map[string]string, selectorGroup []map[string]string) bool {
+	if len(selector) == 0 {
+		return false
+	}
+
+	for _, grouppedSelector := range selectorGroup {
+		if selectorEquals(selector, grouppedSelector) {
+			return true
+		}
+	}
+
+	return false
+}
+
 // Describe returns the description of a project
 func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error) {
 	var f formatter = namespacedFormatter{}
@@ -195,9 +226,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()...)
 
+	seenSelectors := []map[string]string{}
+
+	services := []graphview.ServiceGroup{}
+	groupedServices := []graphview.ServiceGroup{}
+
+	// calculate services with identical selectors
+	for _, svc := range allServices {
+		if containsSelector(svc.Service.Spec.Selector, seenSelectors) {
+			groupedServices = append(groupedServices, svc)
+			continue
+		}
+
+		services = append(services, svc)
+		seenSelectors = append(seenSelectors, svc.Service.Spec.Selector)
+	}
+
 	standaloneDCs, coveredByDCs := graphview.AllDeploymentConfigPipelines(g, coveredNodes)
 	coveredNodes.Insert(coveredByDCs.List()...)
 
@@ -243,6 +290,22 @@ 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
+			for _, groupedSvc := range groupedServices {
+				if !selectorEquals(groupedSvc.Service.Spec.Selector, service.Service.Spec.Selector) {
+					continue
+				}
+
+				var grouppedExposes []string
+				for _, routeNode := range groupedSvc.ExposingRoutes {
+					grouppedExposes = append(grouppedExposes, describeRouteInServiceGroup(local, routeNode)...)
+				}
+				sort.Sort(exposedRoutes(grouppedExposes))
+
+				printLines(out, "", 0, describeServiceInServiceGroup(f, groupedSvc, grouppedExposes...)...)
+			}
+
 			printLines(out, "", 0, describeServiceInServiceGroup(f, service, exposes...)...)
 
 			for _, dcPipeline := range service.DeploymentConfigPipelines {