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

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

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

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

-	utilruntime "k8s.io/kubernetes/pkg/util/runtime"

 	"k8s.io/kubernetes/pkg/util/sets"

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

@@ -307,23 +306,9 @@ func addImagesToGraph(g graph.Graph, images *imageapi.ImageList, algorithm prune

 		glog.V(4).Infof("Adding image %q to graph", image.Name)

 		imageNode := imagegraph.EnsureImageNode(g, image)

-		manifest := imageapi.DockerImageManifest{}

-		if err := json.Unmarshal([]byte(image.DockerImageManifest), &manifest); err != nil {

-			utilruntime.HandleError(fmt.Errorf("unable to extract manifest from image: %v. This image's layers won't be pruned if the image is pruned now.", err))

-			continue

-		}

-

-		// schema1 layers

-		for _, layer := range manifest.FSLayers {

-			glog.V(4).Infof("Adding image layer v1 %q to graph", layer.DockerBlobSum)

-			layerNode := imagegraph.EnsureImageLayerNode(g, layer.DockerBlobSum)

-			g.AddEdge(imageNode, layerNode, ReferencedImageLayerEdgeKind)

-		}

-

-		// schema2 layers

-		for _, layer := range manifest.Layers {

-			glog.V(4).Infof("Adding image layer v2 %q to graph", layer.Digest)

-			layerNode := imagegraph.EnsureImageLayerNode(g, layer.Digest)

+		for _, layer := range image.DockerImageLayers {

+			glog.V(4).Infof("Adding image layer %q to graph", layer.Name)

+			layerNode := imagegraph.EnsureImageLayerNode(g, layer.Name)

 			g.AddEdge(imageNode, layerNode, ReferencedImageLayerEdgeKind)

 		}

 	}

@@ -365,7 +350,8 @@ func addImageStreamsToGraph(g graph.Graph, streams *imageapi.ImageStreamList, li

 			for i := range history.Items {

 				n := imagegraph.FindImage(g, history.Items[i].Image)

 				if n == nil {

-					glog.V(2).Infof("Unable to find image %q in graph (from tag=%q, revision=%d, dockerImageReference=%s)", history.Items[i].Image, tag, i, history.Items[i].DockerImageReference)

+					glog.V(2).Infof("Unable to find image %q in graph (from tag=%q, revision=%d, dockerImageReference=%s) - skipping",

+						history.Items[i].Image, tag, i, history.Items[i].DockerImageReference)

 					continue

 				}

 				imageNode := n.(*imagegraph.ImageNode)

@@ -482,7 +468,7 @@ func addPodSpecToGraph(g graph.Graph, spec *kapi.PodSpec, predecessor gonum.Node

 		ref, err := imageapi.ParseDockerImageReference(container.Image)

 		if err != nil {

-			utilruntime.HandleError(fmt.Errorf("unable to parse DockerImageReference %q: %v", container.Image, err))

+			glog.V(2).Infof("Unable to parse DockerImageReference %q: %v - skipping", container.Image, err)

 			continue

 		}

@@ -493,7 +479,7 @@ func addPodSpecToGraph(g graph.Graph, spec *kapi.PodSpec, predecessor gonum.Node

 		imageNode := imagegraph.FindImage(g, ref.ID)

 		if imageNode == nil {

-			glog.Infof("Unable to find image %q in the graph", ref.ID)

+			glog.V(2).Infof("Unable to find image %q in the graph - skipping", ref.ID)

 			continue

 		}

@@ -850,12 +836,10 @@ func layerIsPrunable(g graph.Graph, layerNode *imagegraph.ImageLayerNode) bool {

 // given ImageLayerNode.

 func streamLayerReferences(g graph.Graph, layerNode *imagegraph.ImageLayerNode) []*imagegraph.ImageStreamNode {

 	ret := []*imagegraph.ImageStreamNode{}

-

 	for _, predecessor := range g.To(layerNode) {

 		if g.Kind(predecessor) != imagegraph.ImageStreamNodeKind {

 			continue

 		}

-

 		ret = append(ret, predecessor.(*imagegraph.ImageStreamNode))

 	}

@@ -2,7 +2,6 @@ package prune

 import (

 	"bytes"

-	"encoding/json"

 	"errors"

 	"flag"

 	"fmt"

@@ -51,7 +50,7 @@ const (

 )

 func agedImage(id, ref string, ageInMinutes int64) imageapi.Image {

-	image := imageWithLayers(id, ref, false, layer1, layer2, layer3, layer4, layer5)

+	image := imageWithLayers(id, ref, layer1, layer2, layer3, layer4, layer5)

 	if ageInMinutes >= 0 {

 		image.CreationTimestamp = unversioned.NewTime(unversioned.Now().Add(time.Duration(-1*ageInMinutes) * time.Minute))

@@ -61,7 +60,7 @@ func agedImage(id, ref string, ageInMinutes int64) imageapi.Image {

 }

 func sizedImage(id, ref string, size int64) imageapi.Image {

-	image := imageWithLayers(id, ref, false, layer1, layer2, layer3, layer4, layer5)

+	image := imageWithLayers(id, ref, layer1, layer2, layer3, layer4, layer5)

 	image.CreationTimestamp = unversioned.NewTime(unversioned.Now().Add(time.Duration(-1) * time.Minute))

 	image.DockerImageMetadata.Size = size

@@ -72,7 +71,7 @@ func image(id, ref string) imageapi.Image {

 	return agedImage(id, ref, -1)

 }

-func imageWithLayers(id, ref string, v2 bool, layers ...string) imageapi.Image {

+func imageWithLayers(id, ref string, layers ...string) imageapi.Image {

 	image := imageapi.Image{

 		ObjectMeta: kapi.ObjectMeta{

 			Name: id,

@@ -83,59 +82,16 @@ func imageWithLayers(id, ref string, v2 bool, layers ...string) imageapi.Image {

 		DockerImageReference: ref,

 	}

-	manifest := imageapi.DockerImageManifest{}

-	if v2 {

-		manifest.Layers = []imageapi.Descriptor{}

-		for _, layer := range layers {

-			manifest.Layers = append(manifest.Layers, imageapi.Descriptor{Digest: layer})

-		}

-	} else {

-		manifest.FSLayers = []imageapi.DockerFSLayer{}

-		for _, layer := range layers {

-			manifest.FSLayers = append(manifest.FSLayers, imageapi.DockerFSLayer{DockerBlobSum: layer})

-		}

-	}

-

-	manifestBytes, err := json.Marshal(&manifest)

-	if err != nil {

-		panic(err)

-	}

-

-	image.DockerImageManifest = string(manifestBytes)

-

-	return image

-}

-

-func imageWithLayersV1(id, ref string, layers ...string) imageapi.Image {

-	image := imageapi.Image{

-		ObjectMeta: kapi.ObjectMeta{

-			Name: id,

-			Annotations: map[string]string{

-				imageapi.ManagedByOpenShiftAnnotation: "true",

-			},

-		},

-		DockerImageReference: ref,

-	}

-

-	manifest := imageapi.DockerImageManifest{

-		FSLayers: []imageapi.DockerFSLayer{},

-	}

+	image.DockerImageLayers = []imageapi.ImageLayer{}

 	for _, layer := range layers {

-		manifest.FSLayers = append(manifest.FSLayers, imageapi.DockerFSLayer{DockerBlobSum: layer})

+		image.DockerImageLayers = append(image.DockerImageLayers, imageapi.ImageLayer{Name: layer})

 	}

-	manifestBytes, err := json.Marshal(&manifest)

-	if err != nil {

-		panic(err)

-	}

-

-	image.DockerImageManifest = string(manifestBytes)

-

 	return image

 }

 func unmanagedImage(id, ref string, hasAnnotations bool, annotation, value string) imageapi.Image {

-	image := imageWithLayers(id, ref, false)

+	image := imageWithLayers(id, ref)

 	if !hasAnnotations {

 		image.Annotations = nil

 	} else {

@@ -145,12 +101,6 @@ func unmanagedImage(id, ref string, hasAnnotations bool, annotation, value strin

 	return image

 }

-func imageWithBadManifest(id, ref string) imageapi.Image {

-	image := image(id, ref)

-	image.DockerImageManifest = "asdf"

-	return image

-}

-

 func podList(pods ...kapi.Pod) kapi.PodList {

 	return kapi.PodList{

 		Items: pods,

@@ -766,51 +716,12 @@ func TestImagePruning(t *testing.T) {

 			expectedImageDeletions: []string{},

 			expectedStreamUpdates:  []string{},

 		},

-		"image with bad manifest is pruned ok": {

-			images: imageList(

-				imageWithBadManifest("id", "someregistry/foo/bar@id"),

-			),

-			expectedImageDeletions: []string{"id"},

-			expectedStreamUpdates:  []string{},

-		},

-		"image with v1 layers": {

-			images: imageList(

-				imageWithLayers("id1", registryURL+"/foo/bar@id1", false, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id2", registryURL+"/foo/bar@id2", false, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id3", registryURL+"/foo/bar@id3", false, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id4", registryURL+"/foo/bar@id4", false, "layer5", "layer6", "layer7", "layer8"),

-			),

-			streams: streamList(

-				stream(registryURL, "foo", "bar", tags(

-					tag("latest",

-						tagEvent("id1", registryURL+"/foo/bar@id1"),

-						tagEvent("id2", registryURL+"/foo/bar@id2"),

-						tagEvent("id3", registryURL+"/foo/bar@id3"),

-						tagEvent("id4", registryURL+"/foo/bar@id4"),

-					),

-				)),

-			),

-			expectedImageDeletions: []string{"id4"},

-			expectedStreamUpdates:  []string{"foo/bar|id4"},

-			expectedLayerDeletions: []string{

-				registryURL + "|foo/bar|layer5",

-				registryURL + "|foo/bar|layer6",

-				registryURL + "|foo/bar|layer7",

-				registryURL + "|foo/bar|layer8",

-			},

-			expectedBlobDeletions: []string{

-				registryURL + "|layer5",

-				registryURL + "|layer6",

-				registryURL + "|layer7",

-				registryURL + "|layer8",

-			},

-		},

-		"image with v2 layers": {

+		"image with layers": {

 			images: imageList(

-				imageWithLayers("id1", registryURL+"/foo/bar@id1", true, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id2", registryURL+"/foo/bar@id2", true, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id3", registryURL+"/foo/bar@id3", true, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id4", registryURL+"/foo/bar@id4", true, "layer5", "layer6", "layer7", "layer8"),

+				imageWithLayers("id1", registryURL+"/foo/bar@id1", "layer1", "layer2", "layer3", "layer4"),

+				imageWithLayers("id2", registryURL+"/foo/bar@id2", "layer1", "layer2", "layer3", "layer4"),

+				imageWithLayers("id3", registryURL+"/foo/bar@id3", "layer1", "layer2", "layer3", "layer4"),

+				imageWithLayers("id4", registryURL+"/foo/bar@id4", "layer5", "layer6", "layer7", "layer8"),

 			),

 			streams: streamList(

 				stream(registryURL, "foo", "bar", tags(

@@ -1052,8 +963,8 @@ func TestRegistryPruning(t *testing.T) {

 	}{

 		"layers unique to id1 pruned": {

 			images: imageList(

-				imageWithLayers("id1", "registry1/foo/bar@id1", false, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id2", "registry1/foo/bar@id2", false, "layer3", "layer4", "layer5", "layer6"),

+				imageWithLayers("id1", "registry1/foo/bar@id1", "layer1", "layer2", "layer3", "layer4"),

+				imageWithLayers("id2", "registry1/foo/bar@id2", "layer3", "layer4", "layer5", "layer6"),

 			),

 			streams: streamList(

 				stream("registry1", "foo", "bar", tags(

@@ -1082,7 +993,7 @@ func TestRegistryPruning(t *testing.T) {

 		},

 		"no pruning when no images are pruned": {

 			images: imageList(

-				imageWithLayers("id1", "registry1/foo/bar@id1", false, "layer1", "layer2", "layer3", "layer4"),

+				imageWithLayers("id1", "registry1/foo/bar@id1", "layer1", "layer2", "layer3", "layer4"),

 			),

 			streams: streamList(

 				stream("registry1", "foo", "bar", tags(

@@ -1097,8 +1008,8 @@ func TestRegistryPruning(t *testing.T) {

 		},

 		"blobs pruned when streams have already been deleted": {

 			images: imageList(

-				imageWithLayers("id1", "registry1/foo/bar@id1", false, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id2", "registry1/foo/bar@id2", false, "layer3", "layer4", "layer5", "layer6"),

+				imageWithLayers("id1", "registry1/foo/bar@id1", "layer1", "layer2", "layer3", "layer4"),

+				imageWithLayers("id2", "registry1/foo/bar@id2", "layer3", "layer4", "layer5", "layer6"),

 			),

 			expectedLayerDeletions: sets.NewString(),

 			expectedBlobDeletions: sets.NewString(

@@ -1113,8 +1024,8 @@ func TestRegistryPruning(t *testing.T) {

 		},

 		"ping error": {

 			images: imageList(

-				imageWithLayers("id1", "registry1/foo/bar@id1", false, "layer1", "layer2", "layer3", "layer4"),

-				imageWithLayers("id2", "registry1/foo/bar@id2", false, "layer3", "layer4", "layer5", "layer6"),

+				imageWithLayers("id1", "registry1/foo/bar@id1", "layer1", "layer2", "layer3", "layer4"),

+				imageWithLayers("id2", "registry1/foo/bar@id2", "layer3", "layer4", "layer5", "layer6"),

 			),

 			streams: streamList(

 				stream("registry1", "foo", "bar", tags(