Update openshift image layers API

Author: smarterclayton

api/protobuf-spec/github_com_openshift_api_image_v1.proto

@@ -486,15 +486,21 @@ type ImageStreamLayers struct {
 
 // ImageBlobReferences describes the blob references within an image.
 type ImageBlobReferences struct {
+	// imageMissing is true if the image is referenced by the image stream but the image
+	// object has been deleted from the API by an administrator. When this field is set,
+	// layers and config fields may be empty and callers that depend on the image metadata
+	// should consider the image to be unavailable for download or viewing.
+	// +optional
+	ImageMissing bool
 	// layers is the list of blobs that compose this image, from base layer to top layer.
 	// All layers referenced by this array will be defined in the blobs map. Some images
 	// may have zero layers.
 	// +optional
 	Layers []string
-	// manifest, if set, is the blob that contains the image manifest. Some images do
+	// config, if set, is the blob that contains the image configuration. Some images do
 	// not have separate manifest blobs and this field will be set to nil if so.
 	// +optional
-	Manifest *string
+	Config *string
 }
 
 // ImageLayerData contains metadata about an image layer.

api/swagger-spec/openshift-openapi-spec.json

@@ -206,6 +206,9 @@ func addImageStreamLayersFromCache(isl *imageapi.ImageStreamLayers, is *imageapi
 			obj, _, _ := index.GetByKey(item.Image)
 			entry, ok := obj.(*ImageLayers)
 			if !ok {
+				if _, ok := isl.Images[item.Image]; !ok {
+					isl.Images[item.Image] = imageapi.ImageBlobReferences{ImageMissing: true}
+				}
 				missing = append(missing, item.Image)
 				continue
 			}
@@ -224,7 +227,7 @@ func addImageStreamLayersFromCache(isl *imageapi.ImageStreamLayers, is *imageapi
 			}
 
 			if blob := entry.Config; blob != nil {
-				reference.Manifest = &blob.Name
+				reference.Config = &blob.Name
 				if _, ok := isl.Blobs[blob.Name]; !ok {
 					if blob.LayerSize == 0 {
 						// only send media type since we don't the size of the manifest

pkg/image/apis/image/types.go

@@ -34,6 +34,44 @@ var _ = g.Describe("[Feature:ImageLayers] Image layer subresource", func() {
 
 	oc = exutil.NewCLI("image-layers", exutil.KubeConfigPath())
 
+	g.It("should identify a deleted image as missing", func() {
+		client := imageclientset.NewForConfigOrDie(oc.AdminConfig()).Image()
+		_, err := client.ImageStreams(oc.Namespace()).Create(&imageapi.ImageStream{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "test",
+			},
+		})
+		o.Expect(err).NotTo(o.HaveOccurred())
+		_, err = client.ImageStreamMappings(oc.Namespace()).Create(&imageapi.ImageStreamMapping{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "test",
+			},
+			Image: imageapi.Image{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "an_image_to_be_deleted",
+				},
+				DockerImageReference: "example.com/random/image:latest",
+			},
+			Tag: "missing",
+		})
+		o.Expect(err).NotTo(o.HaveOccurred())
+		err = client.Images().Delete("an_image_to_be_deleted", nil)
+		o.Expect(err).NotTo(o.HaveOccurred())
+		err = wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
+			layers, err := client.ImageStreams(oc.Namespace()).Layers("test", metav1.GetOptions{})
+			if err != nil {
+				return false, err
+			}
+			ref, ok := layers.Images["an_image_to_be_deleted"]
+			if !ok {
+				return false, nil
+			}
+			o.Expect(ref.ImageMissing).To(o.BeTrue())
+			return true, nil
+		})
+		o.Expect(err).NotTo(o.HaveOccurred())
+	})
+
 	g.It("should return layers from tagged images", func() {
 		ns = []string{oc.Namespace()}
 		client := imageclientset.NewForConfigOrDie(oc.UserConfig()).Image()
@@ -71,9 +109,9 @@ var _ = g.Describe("[Feature:ImageLayers] Image layer subresource", func() {
 				l, ok := layers.Images[image.Image.Name]
 				o.Expect(ok).To(o.BeTrue())
 				o.Expect(len(l.Layers)).To(o.BeNumerically(">", 0))
-				o.Expect(l.Manifest).ToNot(o.BeNil())
-				o.Expect(layers.Blobs[*l.Manifest]).ToNot(o.BeNil())
-				o.Expect(layers.Blobs[*l.Manifest].MediaType).To(o.Equal("application/vnd.docker.container.image.v1+json"))
+				o.Expect(l.Config).ToNot(o.BeNil())
+				o.Expect(layers.Blobs[*l.Config]).ToNot(o.BeNil())
+				o.Expect(layers.Blobs[*l.Config].MediaType).To(o.Equal("application/vnd.docker.container.image.v1+json"))
 				for _, layerID := range l.Layers {
 					o.Expect(layers.Blobs).To(o.HaveKey(layerID))
 					o.Expect(layers.Blobs[layerID].MediaType).NotTo(o.BeEmpty())