@@ -80,5 +80,5 @@ type SortedDeploymentConfigPipeline []DeploymentConfigPipeline

 func (m SortedDeploymentConfigPipeline) Len() int      { return len(m) }

 func (m SortedDeploymentConfigPipeline) Swap(i, j int) { m[i], m[j] = m[j], m[i] }

 func (m SortedDeploymentConfigPipeline) Less(i, j int) bool {

-	return CompareObjectMeta(&m[i].Deployment.ObjectMeta, &m[j].Deployment.ObjectMeta)

+	return CompareObjectMeta(&m[i].Deployment.DeploymentConfig.ObjectMeta, &m[j].Deployment.DeploymentConfig.ObjectMeta)

 }

new file mode 100644

@@ -0,0 +1,51 @@

+package graphview

+

+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"

+)

+

+type PetSet struct {

+	PetSet *kubegraph.PetSetNode

+

+	OwnedPods   []*kubegraph.PodNode

+	CreatedPods []*kubegraph.PodNode

+

+	// TODO: handle conflicting once controller refs are present, not worth it yet

+}

+

+// AllPetSets returns all the PetSets that aren't in the excludes set and the set of covered NodeIDs

+func AllPetSets(g osgraph.Graph, excludeNodeIDs IntSet) ([]PetSet, IntSet) {

+	covered := IntSet{}

+	views := []PetSet{}

+

+	for _, uncastNode := range g.NodesByKind(kubegraph.PetSetNodeKind) {

+		if excludeNodeIDs.Has(uncastNode.ID()) {

+			continue

+		}

+

+		view, covers := NewPetSet(g, uncastNode.(*kubegraph.PetSetNode))

+		covered.Insert(covers.List()...)

+		views = append(views, view)

+	}

+

+	return views, covered

+}

+

+// NewPetSet returns the PetSet and a set of all the NodeIDs covered by the PetSet

+func NewPetSet(g osgraph.Graph, node *kubegraph.PetSetNode) (PetSet, IntSet) {

+	covered := IntSet{}

+	covered.Insert(node.ID())

+

+	view := PetSet{}

+	view.PetSet = node

+

+	for _, uncastPodNode := range g.PredecessorNodesByEdgeKind(node, kubeedges.ManagedByControllerEdgeKind) {

+		podNode := uncastPodNode.(*kubegraph.PodNode)

+		covered.Insert(podNode.ID())

+		view.OwnedPods = append(view.OwnedPods, podNode)

+	}

+

+	return view, covered

+}

@@ -60,13 +60,13 @@ func NewReplicationController(g osgraph.Graph, rcNode *kubegraph.ReplicationCont

 	rcView.RC = rcNode

 	rcView.ConflictingRCIDToPods = map[int][]*kubegraph.PodNode{}

-	for _, uncastPodNode := range g.PredecessorNodesByEdgeKind(rcNode, kubeedges.ManagedByRCEdgeKind) {

+	for _, uncastPodNode := range g.PredecessorNodesByEdgeKind(rcNode, kubeedges.ManagedByControllerEdgeKind) {

 		podNode := uncastPodNode.(*kubegraph.PodNode)

 		covered.Insert(podNode.ID())

 		rcView.OwnedPods = append(rcView.OwnedPods, podNode)

 		// check to see if this pod is managed by more than one RC

-		uncastOwningRCs := g.SuccessorNodesByEdgeKind(podNode, kubeedges.ManagedByRCEdgeKind)

+		uncastOwningRCs := g.SuccessorNodesByEdgeKind(podNode, kubeedges.ManagedByControllerEdgeKind)

 		if len(uncastOwningRCs) > 1 {

 			for _, uncastOwningRC := range uncastOwningRCs {

 				if uncastOwningRC.ID() == rcNode.ID() {

@@ -21,10 +21,13 @@ type ServiceGroup struct {

 	DeploymentConfigPipelines []DeploymentConfigPipeline

 	ReplicationControllers    []ReplicationController

+	PetSets                   []PetSet

-	FulfillingDCs  []*deploygraph.DeploymentConfigNode

-	FulfillingRCs  []*kubegraph.ReplicationControllerNode

-	FulfillingPods []*kubegraph.PodNode

+	// TODO: this has to stop

+	FulfillingPetSets []*kubegraph.PetSetNode

+	FulfillingDCs     []*deploygraph.DeploymentConfigNode

+	FulfillingRCs     []*kubegraph.ReplicationControllerNode

+	FulfillingPods    []*kubegraph.PodNode

 	ExposingRoutes []*routegraph.RouteNode

 }

@@ -66,6 +69,8 @@ func NewServiceGroup(g osgraph.Graph, serviceNode *kubegraph.ServiceNode) (Servi

 			service.FulfillingRCs = append(service.FulfillingRCs, castContainer)

 		case *kubegraph.PodNode:

 			service.FulfillingPods = append(service.FulfillingPods, castContainer)

+		case *kubegraph.PetSetNode:

+			service.FulfillingPetSets = append(service.FulfillingPetSets, castContainer)

 		default:

 			utilruntime.HandleError(fmt.Errorf("unrecognized container: %v", castContainer))

 		}

@@ -97,6 +102,13 @@ func NewServiceGroup(g osgraph.Graph, serviceNode *kubegraph.ServiceNode) (Servi

 		service.ReplicationControllers = append(service.ReplicationControllers, rcView)

 	}

+	for _, fulfillingPetSet := range service.FulfillingPetSets {

+		view, covers := NewPetSet(g, fulfillingPetSet)

+

+		covered.Insert(covers.List()...)

+		service.PetSets = append(service.PetSets, view)

+	}

+

 	for _, fulfillingPod := range service.FulfillingPods {

 		_, podCovers := NewPod(g, fulfillingPod)

 		covered.Insert(podCovers.List()...)

@@ -78,7 +78,7 @@ func TestBareRCGroup(t *testing.T) {

 	kubeedges.AddAllExposedPodTemplateSpecEdges(g)

 	kubeedges.AddAllExposedPodEdges(g)

-	kubeedges.AddAllManagedByRCPodEdges(g)

+	kubeedges.AddAllManagedByControllerPodEdges(g)

 	coveredNodes := IntSet{}

@@ -399,7 +399,7 @@ func TestGraph(t *testing.T) {

 	}

 	for _, bareDCPipeline := range bareDCPipelines {

-		t.Logf("from %s", bareDCPipeline.Deployment.Name)

+		t.Logf("from %s", bareDCPipeline.Deployment.DeploymentConfig.Name)

 		for _, path := range bareDCPipeline.Images {

 			t.Logf("  %v", path)

 		}

@@ -413,7 +413,7 @@ func TestGraph(t *testing.T) {

 		indent := "  "

 		for _, deployment := range serviceGroup.DeploymentConfigPipelines {

-			t.Logf("%sdeployment %s", indent, deployment.Deployment.Name)

+			t.Logf("%sdeployment %s", indent, deployment.Deployment.DeploymentConfig.Name)

 			for _, image := range deployment.Images {

 				t.Logf("%s  image %s", indent, image.Image.ImageSpec())

 				if image.Build != nil {

@@ -21,11 +21,11 @@ func FindDuelingReplicationControllers(g osgraph.Graph, f osgraph.Namer) []osgra

 	for _, uncastRCNode := range g.NodesByKind(kubegraph.ReplicationControllerNodeKind) {

 		rcNode := uncastRCNode.(*kubegraph.ReplicationControllerNode)

-		for _, uncastPodNode := range g.PredecessorNodesByEdgeKind(rcNode, kubeedges.ManagedByRCEdgeKind) {

+		for _, uncastPodNode := range g.PredecessorNodesByEdgeKind(rcNode, kubeedges.ManagedByControllerEdgeKind) {

 			podNode := uncastPodNode.(*kubegraph.PodNode)

 			// check to see if this pod is managed by more than one RC

-			uncastOwningRCs := g.SuccessorNodesByEdgeKind(podNode, kubeedges.ManagedByRCEdgeKind)

+			uncastOwningRCs := g.SuccessorNodesByEdgeKind(podNode, kubeedges.ManagedByControllerEdgeKind)

 			if len(uncastOwningRCs) > 1 {

 				involvedRCNames := []string{}

 				relatedNodes := []graph.Node{uncastPodNode}

@@ -14,7 +14,7 @@ func TestDuelingRC(t *testing.T) {

 		t.Fatalf("unexpected error: %v", err)

 	}

-	kubeedges.AddAllManagedByRCPodEdges(g)

+	kubeedges.AddAllManagedByControllerPodEdges(g)

 	markers := FindDuelingReplicationControllers(g, osgraph.DefaultNamer)

 	if e, a := 2, len(markers); e != a {

@@ -8,6 +8,8 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	_ "k8s.io/kubernetes/pkg/api/install"

+	"k8s.io/kubernetes/pkg/api/unversioned"

+	kapps "k8s.io/kubernetes/pkg/apis/apps"

 	"k8s.io/kubernetes/pkg/apis/autoscaling"

 	"k8s.io/kubernetes/pkg/runtime"

@@ -38,6 +40,14 @@ func TestNamespaceEdgeMatching(t *testing.T) {

 		rc.Spec.Selector = map[string]string{"a": "1"}

 		kubegraph.EnsureReplicationControllerNode(g, rc)

+		p := &kapps.PetSet{}

+		p.Namespace = namespace

+		p.Name = "the-petset"

+		p.Spec.Selector = &unversioned.LabelSelector{

+			MatchLabels: map[string]string{"a": "1"},

+		}

+		kubegraph.EnsurePetSetNode(g, p)

+

 		svc := &kapi.Service{}

 		svc.Namespace = namespace

 		svc.Name = "the-svc"

@@ -49,7 +59,7 @@ func TestNamespaceEdgeMatching(t *testing.T) {

 	fn("other", g)

 	AddAllExposedPodEdges(g)

 	AddAllExposedPodTemplateSpecEdges(g)

-	AddAllManagedByRCPodEdges(g)

+	AddAllManagedByControllerPodEdges(g)

 	for _, edge := range g.Edges() {

 		nsTo, err := namespaceFor(edge.To())

@@ -79,6 +89,10 @@ func namespaceFor(node graph.Node) (string, error) {

 		return node.(*kubegraph.PodSpecNode).Namespace, nil

 	case *kapi.ReplicationControllerSpec:

 		return node.(*kubegraph.ReplicationControllerSpecNode).Namespace, nil

+	case *kapps.PetSetSpec:

+		return node.(*kubegraph.PetSetSpecNode).Namespace, nil

+	case *kapi.PodTemplateSpec:

+		return node.(*kubegraph.PodTemplateSpecNode).Namespace, nil

 	default:

 		return "", fmt.Errorf("unknown object: %#v", obj)

 	}

@@ -20,8 +20,8 @@ import (

 const (

 	// ExposedThroughServiceEdgeKind 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"

+	// ManagedByControllerEdgeKind goes from Pod to controller when the Pod satisfies a controller's label selector

+	ManagedByControllerEdgeKind = "ManagedByController"

 	// MountedSecretEdgeKind goes from PodSpec to Secret indicating that is or will be a request to mount a volume with the Secret.

 	MountedSecretEdgeKind = "MountedSecret"

 	// MountableSecretEdgeKind goes from ServiceAccount to Secret indicating that the SA allows the Secret to be mounted

@@ -91,31 +91,36 @@ func AddAllExposedPodEdges(g osgraph.MutableUniqueGraph) {

 	}

 }

-// AddManagedByRCPodEdges ensures that a directed edge exists between an RC and all the pods

+// AddManagedByControllerPodEdges ensures that a directed edge exists between a controller 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 {

+func AddManagedByControllerPodEdges(g osgraph.MutableUniqueGraph, to graph.Node, namespace string, selector map[string]string) {

+	if selector == nil {

 		return

 	}

-	query := labels.SelectorFromSet(rcNode.Spec.Selector)

+	query := labels.SelectorFromSet(selector)

 	for _, n := range g.(graph.Graph).Nodes() {

 		switch target := n.(type) {

 		case *kubegraph.PodNode:

-			if target.Namespace != rcNode.Namespace {

+			if target.Namespace != namespace {

 				continue

 			}

 			if query.Matches(labels.Set(target.Labels)) {

-				g.AddEdge(target, rcNode, ManagedByRCEdgeKind)

+				g.AddEdge(target, to, ManagedByControllerEdgeKind)

 			}

 		}

 	}

 }

-// AddAllManagedByRCPodEdges calls AddManagedByRCPodEdges for every ServiceNode in the graph

-func AddAllManagedByRCPodEdges(g osgraph.MutableUniqueGraph) {

+// AddAllManagedByControllerPodEdges calls AddManagedByControllerPodEdges for every node in the graph

+// TODO: should do this through an interface (selects pods)

+func AddAllManagedByControllerPodEdges(g osgraph.MutableUniqueGraph) {

 	for _, node := range g.(graph.Graph).Nodes() {

-		if rcNode, ok := node.(*kubegraph.ReplicationControllerNode); ok {

-			AddManagedByRCPodEdges(g, rcNode)

+		switch cast := node.(type) {

+		case *kubegraph.ReplicationControllerNode:

+			AddManagedByControllerPodEdges(g, cast, cast.ReplicationController.Namespace, cast.ReplicationController.Spec.Selector)

+		case *kubegraph.PetSetNode:

+			// TODO: refactor to handle expanded selectors (along with ReplicaSets and Deployments)

+			AddManagedByControllerPodEdges(g, cast, cast.PetSet.Namespace, cast.PetSet.Spec.Selector.MatchLabels)

 		}

 	}

 }

@@ -4,6 +4,7 @@ import (

 	"github.com/gonum/graph"

 	kapi "k8s.io/kubernetes/pkg/api"

+	kapps "k8s.io/kubernetes/pkg/apis/apps"

 	"k8s.io/kubernetes/pkg/apis/autoscaling"

 	osgraph "github.com/openshift/origin/pkg/api/graph"

@@ -154,3 +155,33 @@ func EnsureHorizontalPodAutoscalerNode(g osgraph.MutableUniqueGraph, hpa *autosc

 		},

 	).(*HorizontalPodAutoscalerNode)

 }

+

+func EnsurePetSetNode(g osgraph.MutableUniqueGraph, petset *kapps.PetSet) *PetSetNode {

+	nodeName := PetSetNodeName(petset)

+	node := osgraph.EnsureUnique(g,

+		nodeName,

+		func(node osgraph.Node) graph.Node {

+			return &PetSetNode{node, petset}

+		},

+	).(*PetSetNode)

+

+	specNode := EnsurePetSetSpecNode(g, &petset.Spec, petset.Namespace, nodeName)

+	g.AddEdge(node, specNode, osgraph.ContainsEdgeKind)

+

+	return node

+}

+

+func EnsurePetSetSpecNode(g osgraph.MutableUniqueGraph, spec *kapps.PetSetSpec, namespace string, ownerName osgraph.UniqueName) *PetSetSpecNode {

+	specName := PetSetSpecNodeName(spec, ownerName)

+	specNode := osgraph.EnsureUnique(g,

+		specName,

+		func(node osgraph.Node) graph.Node {

+			return &PetSetSpecNode{node, spec, namespace, ownerName}

+		},

+	).(*PetSetSpecNode)

+

+	ptSpecNode := EnsurePodTemplateSpecNode(g, &spec.Template, namespace, specName)

+	g.AddEdge(specNode, ptSpecNode, osgraph.ContainsEdgeKind)

+

+	return specNode

+}

@@ -5,6 +5,7 @@ import (

 	"reflect"

 	kapi "k8s.io/kubernetes/pkg/api"

+	kapps "k8s.io/kubernetes/pkg/apis/apps"

 	"k8s.io/kubernetes/pkg/apis/autoscaling"

 	osgraph "github.com/openshift/origin/pkg/api/graph"

@@ -20,6 +21,8 @@ var (

 	ServiceAccountNodeKind            = reflect.TypeOf(kapi.ServiceAccount{}).Name()

 	SecretNodeKind                    = reflect.TypeOf(kapi.Secret{}).Name()

 	HorizontalPodAutoscalerNodeKind   = reflect.TypeOf(autoscaling.HorizontalPodAutoscaler{}).Name()

+	PetSetNodeKind                    = reflect.TypeOf(kapps.PetSet{}).Name()

+	PetSetSpecNodeKind                = reflect.TypeOf(kapps.PetSetSpec{}).Name()

 )

 func ServiceNodeName(o *kapi.Service) osgraph.UniqueName {

@@ -108,7 +111,7 @@ func ReplicationControllerNodeName(o *kapi.ReplicationController) osgraph.Unique

 type ReplicationControllerNode struct {

 	osgraph.Node

-	*kapi.ReplicationController

+	ReplicationController *kapi.ReplicationController

 	IsFound bool

 }

@@ -139,8 +142,8 @@ func ReplicationControllerSpecNodeName(o *kapi.ReplicationControllerSpec, ownerN

 type ReplicationControllerSpecNode struct {

 	osgraph.Node

-	*kapi.ReplicationControllerSpec

-	Namespace string

+	ReplicationControllerSpec *kapi.ReplicationControllerSpec

+	Namespace                 string

 	OwnerName osgraph.UniqueName

 }

@@ -267,3 +270,56 @@ func (*HorizontalPodAutoscalerNode) Kind() string {

 func (n HorizontalPodAutoscalerNode) UniqueName() osgraph.UniqueName {

 	return HorizontalPodAutoscalerNodeName(n.HorizontalPodAutoscaler)

 }

+

+func PetSetNodeName(o *kapps.PetSet) osgraph.UniqueName {

+	return osgraph.GetUniqueRuntimeObjectNodeName(PetSetNodeKind, o)

+}

+

+type PetSetNode struct {

+	osgraph.Node

+	PetSet *kapps.PetSet

+}

+

+func (n PetSetNode) Object() interface{} {

+	return n.PetSet

+}

+

+func (n PetSetNode) String() string {

+	return string(n.UniqueName())

+}

+

+func (n PetSetNode) UniqueName() osgraph.UniqueName {

+	return PetSetNodeName(n.PetSet)

+}

+

+func (*PetSetNode) Kind() string {

+	return PetSetNodeKind

+}

+

+func PetSetSpecNodeName(o *kapps.PetSetSpec, ownerName osgraph.UniqueName) osgraph.UniqueName {

+	return osgraph.UniqueName(fmt.Sprintf("%s|%v", PetSetSpecNodeKind, ownerName))

+}

+

+type PetSetSpecNode struct {

+	osgraph.Node

+	PetSetSpec *kapps.PetSetSpec

+	Namespace  string

+

+	OwnerName osgraph.UniqueName

+}

+

+func (n PetSetSpecNode) Object() interface{} {

+	return n.PetSetSpec

+}

+

+func (n PetSetSpecNode) String() string {

+	return string(n.UniqueName())

+}

+

+func (n PetSetSpecNode) UniqueName() osgraph.UniqueName {

+	return PetSetSpecNodeName(n.PetSetSpec, n.OwnerName)

+}

+

+func (*PetSetSpecNode) Kind() string {

+	return PetSetSpecNodeKind

+}

@@ -11,6 +11,7 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	kapierrors "k8s.io/kubernetes/pkg/api/errors"

 	"k8s.io/kubernetes/pkg/api/unversioned"

+	kapps "k8s.io/kubernetes/pkg/apis/apps"

 	"k8s.io/kubernetes/pkg/apis/autoscaling"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

 	utilerrors "k8s.io/kubernetes/pkg/util/errors"

@@ -69,6 +70,7 @@ func (d *ProjectStatusDescriber) MakeGraph(namespace string) (osgraph.Graph, set

 		&secretLoader{namespace: namespace, lister: d.K},

 		&rcLoader{namespace: namespace, lister: d.K},

 		&podLoader{namespace: namespace, lister: d.K},

+		&petsetLoader{namespace: namespace, lister: d.K.Apps()},

 		&horizontalPodAutoscalerLoader{namespace: namespace, lister: d.K.Autoscaling()},

 		// TODO check swagger for feature enablement and selectively add bcLoader and buildLoader

 		// then remove errors.TolerateNotFoundError method.

@@ -108,7 +110,7 @@ func (d *ProjectStatusDescriber) MakeGraph(namespace string) (osgraph.Graph, set

 	kubeedges.AddAllExposedPodTemplateSpecEdges(g)

 	kubeedges.AddAllExposedPodEdges(g)

-	kubeedges.AddAllManagedByRCPodEdges(g)

+	kubeedges.AddAllManagedByControllerPodEdges(g)

 	kubeedges.AddAllRequestedServiceAccountEdges(g)

 	kubeedges.AddAllMountableSecretEdges(g)

 	kubeedges.AddAllMountedSecretEdges(g)

@@ -188,6 +190,10 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error

 				printLines(out, indent, 1, describeDeploymentInServiceGroup(local, dcPipeline, graphview.MaxRecentContainerRestartsForRC(g, dcPipeline.ActiveDeployment))...)

 			}

+			for _, node := range service.FulfillingPetSets {

+				printLines(out, indent, 1, describePetSetInServiceGroup(local, node)...)

+			}

+

 		rcNode:

 			for _, rcNode := range service.FulfillingRCs {

 				for _, coveredDC := range service.FulfillingDCs {

@@ -199,14 +205,20 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error

 			}

 		pod:

-			for _, podNode := range service.FulfillingPods {

+			for _, node := 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.Edge(podNode, coveredRC) != nil {

+					if g.Edge(node, coveredRC) != nil {

+						continue pod

+					}

+				}

+				// TODO: collapse into FulfillingControllers

+				for _, covered := range service.FulfillingPetSets {

+					if g.Edge(node, covered) != nil {

 						continue pod

 					}

 				}

-				printLines(out, indent, 1, describePodInServiceGroup(local, podNode)...)

+				printLines(out, indent, 1, describePodInServiceGroup(local, node)...)

 			}

 		}

@@ -423,9 +435,11 @@ func (f namespacedFormatter) ResourceName(obj interface{}) string {

 	case *kubegraph.ServiceAccountNode:

 		return namespaceNameWithType("sa", t.Name, t.Namespace, f.currentNamespace, f.hideNamespace)

 	case *kubegraph.ReplicationControllerNode:

-		return namespaceNameWithType("rc", t.Name, t.Namespace, f.currentNamespace, f.hideNamespace)

+		return namespaceNameWithType("rc", t.ReplicationController.Name, t.ReplicationController.Namespace, f.currentNamespace, f.hideNamespace)

 	case *kubegraph.HorizontalPodAutoscalerNode:

 		return namespaceNameWithType("hpa", t.HorizontalPodAutoscaler.Name, t.HorizontalPodAutoscaler.Namespace, f.currentNamespace, f.hideNamespace)

+	case *kubegraph.PetSetNode:

+		return namespaceNameWithType("petset", t.PetSet.Name, t.PetSet.Namespace, f.currentNamespace, f.hideNamespace)

 	case *imagegraph.ImageStreamNode:

 		return namespaceNameWithType("is", t.ImageStream.Name, t.ImageStream.Namespace, f.currentNamespace, f.hideNamespace)

@@ -467,15 +481,15 @@ func describeAllProjectsOnServer(f formatter, server string) string {

 }

 func describeDeploymentInServiceGroup(f formatter, deploy graphview.DeploymentConfigPipeline, restartCount int32) []string {

-	local := namespacedFormatter{currentNamespace: deploy.Deployment.Namespace}

+	local := namespacedFormatter{currentNamespace: deploy.Deployment.DeploymentConfig.Namespace}

 	includeLastPass := deploy.ActiveDeployment == nil

 	if len(deploy.Images) == 1 {

 		format := "%s deploys %s %s"

-		if deploy.Deployment.Spec.Test {

+		if deploy.Deployment.DeploymentConfig.Spec.Test {

 			format = "%s test deploys %s %s"

 		}

-		lines := []string{fmt.Sprintf(format, f.ResourceName(deploy.Deployment), describeImageInPipeline(local, deploy.Images[0], deploy.Deployment.Namespace), describeDeploymentConfigTrigger(deploy.Deployment.DeploymentConfig))}

+		lines := []string{fmt.Sprintf(format, f.ResourceName(deploy.Deployment), describeImageInPipeline(local, deploy.Images[0], deploy.Deployment.DeploymentConfig.Namespace), describeDeploymentConfigTrigger(deploy.Deployment.DeploymentConfig))}

 		if len(lines[0]) > 120 && strings.Contains(lines[0], " <- ") {

 			segments := strings.SplitN(lines[0], " <- ", 2)

 			lines[0] = segments[0] + " <-"

@@ -487,18 +501,27 @@ func describeDeploymentInServiceGroup(f formatter, deploy graphview.DeploymentCo

 	}

 	format := "%s deploys %s"

-	if deploy.Deployment.Spec.Test {

+	if deploy.Deployment.DeploymentConfig.Spec.Test {

 		format = "%s test deploys %s"

 	}

 	lines := []string{fmt.Sprintf(format, f.ResourceName(deploy.Deployment), describeDeploymentConfigTrigger(deploy.Deployment.DeploymentConfig))}

 	for _, image := range deploy.Images {

-		lines = append(lines, describeImageInPipeline(local, image, deploy.Deployment.Namespace))

+		lines = append(lines, describeImageInPipeline(local, image, deploy.Deployment.DeploymentConfig.Namespace))

 		lines = append(lines, indentLines("  ", describeAdditionalBuildDetail(image.Build, image.LastSuccessfulBuild, image.LastUnsuccessfulBuild, image.ActiveBuilds, image.DestinationResolved, includeLastPass)...)...)

 		lines = append(lines, describeDeployments(local, deploy.Deployment, deploy.ActiveDeployment, deploy.InactiveDeployments, restartCount, maxDisplayDeployments)...)

 	}

 	return lines

 }

+func describePetSetInServiceGroup(f formatter, node *kubegraph.PetSetNode) []string {

+	images := []string{}

+	for _, container := range node.PetSet.Spec.Template.Spec.Containers {

+		images = append(images, container.Image)

+	}

+

+	return []string{fmt.Sprintf("%s manages %s, %s", f.ResourceName(node), strings.Join(images, ", "), describePetSetStatus(node.PetSet))}

+}

+

 func describeRCInServiceGroup(f formatter, rcNode *kubegraph.ReplicationControllerNode) []string {

 	if rcNode.ReplicationController.Spec.Template == nil {

 		return []string{}

@@ -916,7 +939,7 @@ func describeDeployments(f formatter, dcNode *deploygraph.DeploymentConfigNode,

 		switch {

 		case count == -1:

-			if deployutil.DeploymentStatusFor(deployment) == deployapi.DeploymentStatusComplete {

+			if deployutil.DeploymentStatusFor(deployment.ReplicationController) == deployapi.DeploymentStatusComplete {

 				return out

 			}

 		default:

@@ -944,48 +967,51 @@ func describeDeploymentStatus(deploy *kapi.ReplicationController, first, test bo

 			reason = fmt.Sprintf(": %s", reason)

 		}

 		// TODO: encode fail time in the rc

-		return fmt.Sprintf("deployment #%d failed %s ago%s%s", version, timeAt, reason, describePodSummaryInline(deploy, false, restartCount))

+		return fmt.Sprintf("deployment #%d failed %s ago%s%s", version, timeAt, reason, describePodSummaryInline(deploy.Status.Replicas, deploy.Spec.Replicas, false, restartCount))

 	case deployapi.DeploymentStatusComplete:

 		// TODO: pod status output

 		if test {

 			return fmt.Sprintf("test deployment #%d deployed %s ago", version, timeAt)

 		}

-		return fmt.Sprintf("deployment #%d deployed %s ago%s", version, timeAt, describePodSummaryInline(deploy, first, restartCount))

+		return fmt.Sprintf("deployment #%d deployed %s ago%s", version, timeAt, describePodSummaryInline(deploy.Status.Replicas, deploy.Spec.Replicas, first, restartCount))

 	case deployapi.DeploymentStatusRunning:

 		format := "deployment #%d running%s for %s%s"

 		if test {

 			format = "test deployment #%d running%s for %s%s"

 		}

-		return fmt.Sprintf(format, version, maybeCancelling, timeAt, describePodSummaryInline(deploy, false, restartCount))

+		return fmt.Sprintf(format, version, maybeCancelling, timeAt, describePodSummaryInline(deploy.Status.Replicas, deploy.Spec.Replicas, false, restartCount))

 	default:

-		return fmt.Sprintf("deployment #%d %s%s %s ago%s", version, strings.ToLower(string(status)), maybeCancelling, timeAt, describePodSummaryInline(deploy, false, restartCount))

+		return fmt.Sprintf("deployment #%d %s%s %s ago%s", version, strings.ToLower(string(status)), maybeCancelling, timeAt, describePodSummaryInline(deploy.Status.Replicas, deploy.Spec.Replicas, false, restartCount))

 	}

 }

+func describePetSetStatus(p *kapps.PetSet) string {

+	timeAt := strings.ToLower(formatRelativeTime(p.CreationTimestamp.Time))

+	return fmt.Sprintf("created %s ago%s", timeAt, describePodSummaryInline(int32(p.Status.Replicas), int32(p.Spec.Replicas), false, 0))

+}

+

 func describeRCStatus(rc *kapi.ReplicationController) string {

 	timeAt := strings.ToLower(formatRelativeTime(rc.CreationTimestamp.Time))

-	return fmt.Sprintf("rc/%s created %s ago%s", rc.Name, timeAt, describePodSummaryInline(rc, false, 0))

+	return fmt.Sprintf("rc/%s created %s ago%s", rc.Name, timeAt, describePodSummaryInline(rc.Status.Replicas, rc.Spec.Replicas, false, 0))

 }

-func describePodSummaryInline(rc *kapi.ReplicationController, includeEmpty bool, restartCount int32) string {

-	s := describePodSummary(rc, includeEmpty, restartCount)

+func describePodSummaryInline(actual, requested int32, includeEmpty bool, restartCount int32) string {

+	s := describePodSummary(actual, requested, includeEmpty, restartCount)

 	if len(s) == 0 {

 		return s

 	}

 	change := ""

-	desired := rc.Spec.Replicas

 	switch {

-	case desired < rc.Status.Replicas:

-		change = fmt.Sprintf(" reducing to %d", desired)

-	case desired > rc.Status.Replicas:

-		change = fmt.Sprintf(" growing to %d", desired)

+	case requested < actual:

+		change = fmt.Sprintf(" reducing to %d", requested)

+	case requested > actual:

+		change = fmt.Sprintf(" growing to %d", requested)

 	}

 	return fmt.Sprintf(" - %s%s", s, change)

 }

-func describePodSummary(rc *kapi.ReplicationController, includeEmpty bool, restartCount int32) string {

-	actual, requested := rc.Status.Replicas, rc.Spec.Replicas

-	restartWarn := ""

+func describePodSummary(actual, requested int32, includeEmpty bool, restartCount int32) string {

+	var restartWarn string

 	if restartCount > 0 {

 		restartWarn = fmt.Sprintf(" (warning: %d restarts)", restartCount)

 	}

@@ -1192,6 +1218,30 @@ func (l *podLoader) AddToGraph(g osgraph.Graph) error {

 	return nil

 }

+type petsetLoader struct {

+	namespace string

+	lister    kclient.PetSetNamespacer

+	items     []kapps.PetSet

+}

+

+func (l *petsetLoader) Load() error {

+	list, err := l.lister.PetSets(l.namespace).List(kapi.ListOptions{})

+	if err != nil {

+		return err

+	}

+

+	l.items = list.Items

+	return nil

+}

+

+func (l *petsetLoader) AddToGraph(g osgraph.Graph) error {

+	for i := range l.items {

+		kubegraph.EnsurePetSetNode(g, &l.items[i])

+	}

+

+	return nil

+}

+

 type horizontalPodAutoscalerLoader struct {

 	namespace string

 	lister    kclient.HorizontalPodAutoscalersNamespacer

@@ -270,6 +270,22 @@ func TestProjectStatus(t *testing.T) {

 			},

 			Time: mustParseTime("2015-04-07T04:12:25Z"),

 		},

+		"with pet sets": {

+			Path: "../../../../test/testdata/app-scenarios/petset.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 on server https://example.com:8443\n",

+				"svc/galera[default] (headless):3306",

+				"petset/mysql manages erkules/galera:basic, created less than a second ago - 3 pods",

+				"* pod/mysql-1[default] has restarted 7 times",

+			},

+			Time: mustParseTime("2015-04-07T04:12:25Z"),

+		},

 		"restarting pod": {

 			Path: "../../../api/graph/test/restarting-pod.yaml",

 			Extra: []runtime.Object{

@@ -103,7 +103,7 @@ func FindDeploymentConfigReadinessWarnings(g osgraph.Graph, f osgraph.Namer, set

 Node:

 	for _, uncastDcNode := range g.NodesByKind(deploygraph.DeploymentConfigNodeKind) {

 		dcNode := uncastDcNode.(*deploygraph.DeploymentConfigNode)

-		if t := dcNode.Spec.Template; t != nil && len(t.Spec.Containers) > 0 {

+		if t := dcNode.DeploymentConfig.Spec.Template; t != nil && len(t.Spec.Containers) > 0 {

 			for _, container := range t.Spec.Containers {

 				if container.ReadinessProbe != nil {

 					continue Node

@@ -64,7 +64,7 @@ func AddAllTriggerEdges(g osgraph.MutableUniqueGraph) {

 func AddDeploymentEdges(g osgraph.MutableUniqueGraph, node *deploygraph.DeploymentConfigNode) *deploygraph.DeploymentConfigNode {

 	for _, n := range g.(graph.Graph).Nodes() {

 		if rcNode, ok := n.(*kubegraph.ReplicationControllerNode); ok {

-			if rcNode.Namespace != node.Namespace {

+			if rcNode.ReplicationController.Namespace != node.DeploymentConfig.Namespace {

 				continue

 			}

 			if BelongsToDeploymentConfig(node.DeploymentConfig, rcNode.ReplicationController) {

@@ -26,7 +26,7 @@ func RelevantDeployments(g osgraph.Graph, dcNode *deploygraph.DeploymentConfigNo

 	sort.Sort(RecentDeploymentReferences(allDeployments))

-	if dcNode.DeploymentConfig.Status.LatestVersion == deployutil.DeploymentVersionFor(allDeployments[0]) {

+	if dcNode.DeploymentConfig.Status.LatestVersion == deployutil.DeploymentVersionFor(allDeployments[0].ReplicationController) {

 		return allDeployments[0], allDeployments[1:]

 	}

@@ -17,7 +17,7 @@ func DeploymentConfigNodeName(o *deployapi.DeploymentConfig) osgraph.UniqueName

 type DeploymentConfigNode struct {

 	osgraph.Node

-	*deployapi.DeploymentConfig

+	DeploymentConfig *deployapi.DeploymentConfig

 	IsFound bool

 }

new file mode 100644

@@ -0,0 +1,496 @@

+apiVersion: v1

+items:

+- apiVersion: apps/v1alpha1

+  kind: PetSet

+  metadata:

+    creationTimestamp: 2016-07-21T15:53:09Z

+    generation: 3

+    labels:

+      app: mysql

+    name: mysql

+    namespace: default

+    resourceVersion: "6790"

+    selfLink: /apis/apps/v1alpha1/namespaces/default/petsets/mysql

+    uid: 3900c985-4f5b-11e6-b8a1-080027242396

+  spec:

+    replicas: 3

+    selector:

+      matchLabels:

+        app: mysql

+    serviceName: galera

+    template:

+      metadata:

+        annotations:

+          pod.alpha.kubernetes.io/init-containers: '[{"name":"install","image":"gcr.io/google_containers/galera-install:0.1","args":["--work-dir=/work-dir"],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"Always"},{"name":"bootstrap","image":"debian:jessie","command":["/work-dir/peer-finder"],"args":["-on-start=\"/work-dir/on-start.sh\"","-service=galera"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"apiVersion":"v1","fieldPath":"metadata.namespace"}}}],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"IfNotPresent"}]'

+          pod.alpha.kubernetes.io/initialized: "true"

+        creationTimestamp: null

+        labels:

+          app: mysql

+      spec:

+        containers:

+        - args:

+          - --defaults-file=/etc/mysql/my-galera.cnf

+          - --user=root

+          image: erkules/galera:basic

+          imagePullPolicy: IfNotPresent

+          name: mysql

+          ports:

+          - containerPort: 3306

+            name: mysql

+            protocol: TCP

+          - containerPort: 4444

+            name: sst

+            protocol: TCP

+          - containerPort: 4567

+            name: replication

+            protocol: TCP

+          - containerPort: 4568

+            name: ist

+            protocol: TCP

+          readinessProbe:

+            exec:

+              command:

+              - sh

+              - -c

+              - mysql -u root -e 'show databases;'

+            failureThreshold: 3

+            initialDelaySeconds: 15

+            periodSeconds: 10

+            successThreshold: 1

+            timeoutSeconds: 5

+          resources: {}

+          terminationMessagePath: /dev/termination-log

+          volumeMounts:

+          - mountPath: /var/lib/

+            name: datadir

+          - mountPath: /etc/mysql

+            name: config

+        dnsPolicy: ClusterFirst

+        restartPolicy: Always

+        securityContext: {}

+        terminationGracePeriodSeconds: 30

+        volumes:

+        - emptyDir: {}

+          name: config

+        - emptyDir: {}

+          name: workdir

+    volumeClaimTemplates:

+    - metadata:

+        annotations:

+          volume.alpha.kubernetes.io/storage-class: anything

+        creationTimestamp: null

+        name: datadir

+      spec:

+        accessModes:

+        - ReadWriteOnce

+        resources:

+          requests:

+            storage: 10Gi

+      status:

+        phase: Pending

+  status:

+    replicas: 3

+- apiVersion: v1

+  kind: Service

+  metadata:

+    annotations:

+      service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"

+    creationTimestamp: 2016-07-21T15:53:09Z

+    labels:

+      app: mysql

+    name: galera

+    namespace: default

+    resourceVersion: "343"

+    selfLink: /api/v1/namespaces/default/services/galera

+    uid: 38fb3915-4f5b-11e6-b8a1-080027242396

+  spec:

+    clusterIP: None

+    portalIP: None

+    ports:

+    - name: mysql

+      port: 3306

+      protocol: TCP

+      targetPort: 3306

+    selector:

+      app: mysql

+    sessionAffinity: None

+    type: ClusterIP

+  status:

+    loadBalancer: {}

+- apiVersion: v1

+  kind: Pod

+  metadata:

+    annotations:

+      kubernetes.io/created-by: |

+        {"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"PetSet","namespace":"default","name":"mysql","uid":"3900c985-4f5b-11e6-b8a1-080027242396","apiVersion":"apps","resourceVersion":"6784"}}

+      openshift.io/scc: anyuid

+      pod.alpha.kubernetes.io/init-container-statuses: '[{"name":"install","state":{"terminated":{"exitCode":0,"reason":"Completed","startedAt":"2016-07-27T02:41:12Z","finishedAt":"2016-07-27T02:41:12Z","containerID":"docker://5c727d8732899605fcfe3eecbeeb02576f18f5b989496073340427a8d2134622"}},"lastState":{},"ready":true,"restartCount":0,"image":"gcr.io/google_containers/galera-install:0.1","imageID":"docker://sha256:56ef857005d0ce479f2db0e4ee0ece05e0766ebfa7e79e27e1513915262a18ec","containerID":"docker://5c727d8732899605fcfe3eecbeeb02576f18f5b989496073340427a8d2134622"},{"name":"bootstrap","state":{"terminated":{"exitCode":0,"reason":"Completed","startedAt":"2016-07-27T02:41:14Z","finishedAt":"2016-07-27T02:41:15Z","containerID":"docker://ab4ca0b3b6ec4860cd55c615534e1e2b11f4c3a33746783aab145919feb2446e"}},"lastState":{},"ready":true,"restartCount":0,"image":"debian:jessie","imageID":"docker://sha256:1b088884749bd93867ddb48ff404d4bbff09a17af8d95bc863efa5d133f87b78","containerID":"docker://ab4ca0b3b6ec4860cd55c615534e1e2b11f4c3a33746783aab145919feb2446e"}]'

+      pod.alpha.kubernetes.io/init-containers: '[{"name":"install","image":"gcr.io/google_containers/galera-install:0.1","args":["--work-dir=/work-dir"],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"},{"name":"default-token-au2xq","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"Always"},{"name":"bootstrap","image":"debian:jessie","command":["/work-dir/peer-finder"],"args":["-on-start=\"/work-dir/on-start.sh\"","-service=galera"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"apiVersion":"v1","fieldPath":"metadata.namespace"}}}],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"},{"name":"default-token-au2xq","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"IfNotPresent"}]'

+      pod.alpha.kubernetes.io/initialized: "true"

+      pod.beta.kubernetes.io/hostname: mysql-0

+      pod.beta.kubernetes.io/subdomain: galera

+    creationTimestamp: 2016-07-27T02:41:09Z

+    generateName: mysql-

+    labels:

+      app: mysql

+    name: mysql-0

+    namespace: default

+    resourceVersion: "7191"

+    selfLink: /api/v1/namespaces/default/pods/mysql-0

+    uid: 92e49e79-53a3-11e6-b45a-080027242396

+  spec:

+    containers:

+    - args:

+      - --defaults-file=/etc/mysql/my-galera.cnf

+      - --user=root

+      image: erkules/galera:basic

+      imagePullPolicy: IfNotPresent

+      name: mysql

+      ports:

+      - containerPort: 3306

+        name: mysql

+        protocol: TCP

+      - containerPort: 4444

+        name: sst

+        protocol: TCP

+      - containerPort: 4567

+        name: replication

+        protocol: TCP

+      - containerPort: 4568

+        name: ist

+        protocol: TCP

+      readinessProbe:

+        exec:

+          command:

+          - sh

+          - -c

+          - mysql -u root -e 'show databases;'

+        failureThreshold: 3

+        initialDelaySeconds: 15

+        periodSeconds: 10

+        successThreshold: 1

+        timeoutSeconds: 5

+      resources: {}