Track OS information for images, prune status tags

Unify location of some base layer constants

Author: smarterclayton

pkg/image/apis/image/dockertypes.go

@@ -139,6 +139,7 @@ type DockerImageConfig struct {
 	Size            int64                 `json:"size,omitempty"`
 	RootFS          *DockerConfigRootFS   `json:"rootfs,omitempty"`
 	History         []DockerConfigHistory `json:"history,omitempty"`
+	OS              string                `json:"os,omitempty"`
 	OSVersion       string                `json:"os.version,omitempty"`
 	OSFeatures      []string              `json:"os.features,omitempty"`
 }

pkg/image/dockerlayer/dockerlayer.go

@@ -0,0 +1,19 @@
+package dockerlayer
+
+// GzippedEmptyLayer is a gzip-compressed version of an empty tar file (1024 NULL bytes)
+// This comes from github.com/docker/distribution/manifest/schema1/config_builder.go; there is
+// a non-zero embedded timestamp; we could zero that, but that would just waste storage space
+// in registries, so let’s use the same values.
+var GzippedEmptyLayer = []byte{
+	31, 139, 8, 0, 0, 9, 110, 136, 0, 255, 98, 24, 5, 163, 96, 20, 140, 88,
+	0, 8, 0, 0, 255, 255, 46, 175, 181, 239, 0, 4, 0, 0,
+}
+
+const (
+	// GzippedEmptyLayerDigest is a digest of GzippedEmptyLayer
+	GzippedEmptyLayerDigest = "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"
+	// EmptyLayerDiffID is the tarsum of the GzippedEmptyLayer
+	EmptyLayerDiffID = "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
+	// DigestSha256EmptyTar is the canonical sha256 digest of empty data
+	DigestSha256EmptyTar = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+)

pkg/image/registry/imagestream/strategy.go

@@ -66,6 +66,15 @@ func (s Strategy) NamespaceScoped() bool {
 	return true
 }
 
+// collapseEmptyStatusTags removes status tags that are completely empty.
+func collapseEmptyStatusTags(stream *imageapi.ImageStream) {
+	for tag, ref := range stream.Status.Tags {
+		if len(ref.Items) == 0 && len(ref.Conditions) == 0 {
+			delete(stream.Status.Tags, tag)
+		}
+	}
+}
+
 // PrepareForCreate clears fields that are not allowed to be set by end users on creation.
 func (s Strategy) PrepareForCreate(ctx apirequest.Context, obj runtime.Object) {
 	stream := obj.(*imageapi.ImageStream)
@@ -78,6 +87,7 @@ func (s Strategy) PrepareForCreate(ctx apirequest.Context, obj runtime.Object) {
 		ref.Generation = &stream.Generation
 		stream.Spec.Tags[tag] = ref
 	}
+	collapseEmptyStatusTags(stream)
 }
 
 // Validate validates a new image stream and verifies the current user is
@@ -510,6 +520,7 @@ func (s Strategy) prepareForUpdate(obj, old runtime.Object, resetStatus bool) {
 	oldStream := old.(*imageapi.ImageStream)
 	stream := obj.(*imageapi.ImageStream)
 
+	collapseEmptyStatusTags(stream)
 	stream.Generation = oldStream.Generation
 	if resetStatus {
 		stream.Status = oldStream.Status

pkg/image/registry/imagestreamtag/rest.go

@@ -3,6 +3,8 @@ package imagestreamtag
 import (
 	"fmt"
 
+	"github.com/golang/glog"
+
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
 	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -383,6 +385,7 @@ func newISTag(tag string, imageStream *imageapi.ImageStream, image *imageapi.Ima
 	event := imageapi.LatestTaggedImage(imageStream, tag)
 	if event == nil || len(event.Image) == 0 {
 		if !allowEmptyEvent {
+			glog.V(4).Infof("did not find tag %s in image stream status tags: %#v", tag, imageStream.Status.Tags)
 			return nil, kapierrors.NewNotFound(imageapi.Resource("imagestreamtags"), istagName)
 		}
 		event = &imageapi.TagEvent{

pkg/oc/admin/top/graph.go

@@ -7,6 +7,7 @@ import (
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	"github.com/openshift/origin/pkg/image/dockerlayer"
 	"github.com/openshift/origin/pkg/oc/graph/genericgraph"
 	imagegraph "github.com/openshift/origin/pkg/oc/graph/imagegraph/nodes"
 	kubegraph "github.com/openshift/origin/pkg/oc/graph/kubegraph/nodes"
@@ -19,11 +20,6 @@ const (
 	HistoricImageStreamImageEdgeKind = "HistoricImageStreamImage"
 	PodImageEdgeKind                 = "PodImage"
 	ParentImageEdgeKind              = "ParentImage"
-
-	// digestSha256EmptyTar is the canonical sha256 digest of empty data
-	digestSHA256EmptyTar = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-	// digest.DigestSha256EmptyTar is empty layer digest, whereas this is gzipped digest of empty layer
-	digestSHA256GzippedEmptyTar = "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"
 )
 
 func getImageNodes(nodes []gonum.Node) []*imagegraph.ImageNode {
@@ -53,7 +49,7 @@ func addImagesToGraph(g genericgraph.Graph, images *imageapi.ImageList) {
 			layer := image.DockerImageLayers[i]
 			layerNode := imagegraph.EnsureImageComponentLayerNode(g, layer.Name)
 			edgeKind := ImageLayerEdgeKind
-			if !topLayerAdded && layer.Name != digestSHA256EmptyTar && layer.Name != digestSHA256GzippedEmptyTar {
+			if !topLayerAdded && layer.Name != dockerlayer.DigestSha256EmptyTar && layer.Name != dockerlayer.GzippedEmptyLayerDigest {
 				edgeKind = ImageTopLayerEdgeKind
 				topLayerAdded = true
 			}

pkg/oc/admin/top/images_test.go

@@ -9,6 +9,7 @@ import (
 	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	"github.com/openshift/origin/pkg/image/dockerlayer"
 )
 
 func TestImagesTop(t *testing.T) {
@@ -298,7 +299,7 @@ func TestImagesTop(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{Name: "image2"},
 						DockerImageLayers: []imageapi.ImageLayer{
 							{Name: "layer1"},
-							{Name: digestSHA256EmptyTar},
+							{Name: dockerlayer.DigestSha256EmptyTar},
 							{Name: "layer2"},
 						},
 						DockerImageManifest: "non empty metadata",
@@ -336,7 +337,7 @@ func TestImagesTop(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{Name: "image2"},
 						DockerImageLayers: []imageapi.ImageLayer{
 							{Name: "layer1"},
-							{Name: digestSHA256GzippedEmptyTar},
+							{Name: dockerlayer.GzippedEmptyLayerDigest},
 							{Name: "layer2"},
 						},
 						DockerImageManifest: "non empty metadata",