Select manifest for default platform from manifest lists

Author: Oleg Bulatov

pkg/image/apis/image/types.go

@@ -28,6 +28,16 @@ const (
 	// ExcludeImageSecretAnnotation indicates that a secret should not be returned by imagestream/secrets.
 	ExcludeImageSecretAnnotation = "openshift.io/image.excludeSecret"
 
+	// DefaultArchAnnotation represents an architecture that should be
+	// selected if an image uses a manifest list and it should be
+	// downconverted.
+	DefaultArchAnnotation = "openshift.io/image.defaultArch"
+
+	// DefaultOSAnnotation represents an operation system that should be
+	// selected if an image uses a manifest list and it should be
+	// downconverted.
+	DefaultOSAnnotation = "openshift.io/image.defaultOS"
+
 	// DefaultImageTag is used when an image tag is needed and the configuration does not specify a tag to use.
 	DefaultImageTag = "latest"
 

pkg/image/importer/client_test.go

@@ -200,7 +200,7 @@ func TestDockerV1Fallback(t *testing.T) {
 
 	retriever := &mockRetriever{err: fmt.Errorf("does not support v2 API")}
 	im := NewImageStreamImporter(retriever, 5, nil, nil)
-	if err := im.Import(ctx, isi); err != nil {
+	if err := im.Import(ctx, isi, nil); err != nil {
 		t.Fatal(err)
 	}
 	if images := isi.Status.Repository.Images; len(images) != 2 || images[0].Tag != "tag1" || images[1].Tag != "test" {