Merge pull request #1841 from ncdc/image-pruning

Merged by openshift-bot
openshift · May 22, 2015 · f63dad9 · f63dad9
2 parents 06c3c24 + 05d1dae
commit f63dad9
Show file tree

Hide file tree

Showing 32 changed files with 2,291 additions and 87 deletions.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry.go b/Godeps/_workspace/src/github.com/docker/distribution/registry.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/handlers/app.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/handlers/app.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/blobstore.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/blobstore.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/cache/cache.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/cache/cache.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/cache/memory.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/cache/memory.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/cache/redis.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/cache/redis.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/layercache.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/layercache.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/layerstore.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/layerstore.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/manifeststore.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/manifeststore.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/registry.go b/Godeps/_workspace/src/github.com/docker/distribution/registry/storage/registry.go
diff --git a/pkg/api/graph/graph.go b/pkg/api/graph/graph.go
@@ -23,6 +23,10 @@ type uniqueNamer interface {
 	UniqueName() string
 }
 
+type NodeFinder interface {
+	Find(name UniqueName) graph.Node
+}
+
 // UniqueNodeInitializer is a graph that allows nodes with a unique name to be added without duplication.
 // If the node is newly added, true will be returned.
 type UniqueNodeInitializer interface {
@@ -44,6 +48,7 @@ type MutableUniqueGraph interface {
 	graph.Mutable
 	MutableDirectedEdge
 	UniqueNodeInitializer
+	NodeFinder
 }
 
 type Edge struct {
@@ -294,6 +299,13 @@ func (g uniqueNamedGraph) FindOrCreate(name UniqueName, fn NodeInitializerFunc)
 	return node, false
 }
 
+func (g uniqueNamedGraph) Find(name UniqueName) graph.Node {
+	if node, ok := g.names[name]; ok {
+		return node
+	}
+	return nil
+}
+
 type typedGraph struct{}
 
 type stringer interface {

diff --git a/pkg/api/graph/graph_test.go b/pkg/api/graph/graph_test.go
@@ -188,7 +188,8 @@ func TestGraph(t *testing.T) {
 			}
 			bc++
 		case *image.ImageStream:
-			if g.Kind(node) != ImageStreamGraphKind {
+			// TODO resolve this check for 2 kinds, since both have the same object type
+			if g.Kind(node) != ImageStreamGraphKind && g.Kind(node) != ImageStreamTagGraphKind {
 				t.Fatalf("unexpected kind: %v", g.Kind(node))
 			}
 			ir++