add and handle controllerRefEdgeKinds

openshift · Oct 17, 2016 · d75004e · d75004e
1 parent 977778b
commit d75004e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/pkg/api/kubegraph/analysis/podspec.go b/pkg/api/kubegraph/analysis/podspec.go
@@ -8,9 +8,7 @@ import (
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubeedges "github.com/openshift/origin/pkg/api/kubegraph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
-	kubenodes "github.com/openshift/origin/pkg/api/kubegraph/nodes"
 	deploygraph "github.com/openshift/origin/pkg/deploy/graph"
-	deploynodes "github.com/openshift/origin/pkg/deploy/graph/nodes"
 	"k8s.io/kubernetes/pkg/util/sets"
 )
 
@@ -84,7 +82,7 @@ func FindMissingSecrets(g osgraph.Graph, f osgraph.Namer) []osgraph.Marker {
 func FindMissingLivenessProbes(g osgraph.Graph, f osgraph.Namer, setProbeCommand string) []osgraph.Marker {
 	markers := []osgraph.Marker{}
 	appendedNodes := sets.NewString()
-	ignoredNodes := findDeploymentEdgeKinds(g)
+	ignoredNodes := findControllerRefEdgeKinds(g)
 
 	for _, uncastPodSpecNode := range g.NodesByKind(kubegraph.PodSpecNodeKind) {
 		podSpecNode := uncastPodSpecNode.(*kubegraph.PodSpecNode)
@@ -187,14 +185,18 @@ func CheckMissingMountedSecrets(g osgraph.Graph, podSpecNode *kubegraph.PodSpecN
 	return missingSecrets
 }
 
-// findDeploymentEdgeKinds returns all replication controller nodes
-// whose deployment is being fulfilled by a DeploymentConfig
-func findDeploymentEdgeKinds(g osgraph.Graph) []graph.Node {
-	nodeFilter := osgraph.NodesOfKind(deploynodes.DeploymentConfigNodeKind)
-	edgeFilter := osgraph.EdgesOfKind(deploygraph.DeploymentEdgeKind)
+func findControllerRefEdgeKinds(g osgraph.Graph) []graph.Node {
+	nodeFilter := osgraph.NodesOfKind()
+	edgeFilter := osgraph.EdgesOfKind(deploygraph.ControllerRefEdgeKind)
 
 	subGraph := g.Subgraph(nodeFilter, edgeFilter)
-	return subGraph.NodesByKind(kubenodes.ReplicationControllerNodeKind)
+	ignoredNodes := []graph.Node{}
+
+	// ignore all nodes "controlled" by another node
+	for _, edge := range subGraph.Edges() {
+		ignoredNodes = append(ignoredNodes, edge.To())
+	}
+	return ignoredNodes
 }
 
 func isNodeInList(node graph.Node, nodeList []graph.Node) bool {

diff --git a/pkg/deploy/graph/edges.go b/pkg/deploy/graph/edges.go
@@ -22,6 +22,8 @@ const (
 	DeploymentEdgeKind = "Deployment"
 	// VolumeClaimEdgeKind goes from DeploymentConfigs to PersistentVolumeClaims indicating a request for persistent storage.
 	VolumeClaimEdgeKind = "VolumeClaim"
+	// ControllerRefEdgeKind goes from a controller node to its controlled child-node
+	ControllerRefEdgeKind = "ControllerRef"
 )
 
 // AddTriggerEdges creates edges that point to named Docker image repositories for each image used in the deployment.
@@ -73,6 +75,7 @@ func AddDeploymentEdges(g osgraph.MutableUniqueGraph, node *deploygraph.Deployme
 			}
 			if BelongsToDeploymentConfig(node.DeploymentConfig, rcNode.ReplicationController) {
 				g.AddEdge(node, rcNode, DeploymentEdgeKind)
+				g.AddEdge(node, rcNode, ControllerRefEdgeKind)
 			}
 		}
 	}