Merge pull request #16322 from dmage/manifest-list-linux-amd64

Automatic merge from submit-queue (batch tested with PRs 13840, 16033, 16322, 16441)

Import manifest lists with linux/amd64 platform

This is an alternative for #16319

Author: openshift-merge-robot

pkg/image/apis/image/types.go

@@ -39,6 +39,16 @@ const (
 	// reversed order of their addition (from newest to oldest).
 	DockerImageLayersOrderDescending = "descending"
 
+	// ImporterPreferArchAnnotation represents an architecture that should be
+	// selected if an image uses a manifest list and it should be
+	// downconverted.
+	ImporterPreferArchAnnotation = "importer.image.openshift.io/prefer-arch"
+
+	// ImporterPreferOSAnnotation represents an operation system that should
+	// be selected if an image uses a manifest list and it should be
+	// downconverted.
+	ImporterPreferOSAnnotation = "importer.image.openshift.io/prefer-os"
+
 	// DefaultImageTag is used when an image tag is needed and the configuration does not specify a tag to use.
 	DefaultImageTag = "latest"
 
@@ -157,7 +167,7 @@ const (
 	SignatureRevoked = "Revoked"
 )
 
-/// SignatureConditionType is a type of image signature condition.
+// SignatureConditionType is a type of image signature condition.
 type SignatureConditionType string
 
 // SignatureCondition describes an image signature condition of particular kind at particular probe time.
@@ -485,7 +495,7 @@ type ImageStreamImportStatus struct {
 	Images []ImageImportStatus
 }
 
-// RepositoryImport indicates to load a set of tags from a given Docker image repository
+// RepositoryImportSpec indicates to load a set of tags from a given Docker image repository
 type RepositoryImportSpec struct {
 	// The source of the import, only kind DockerImage is supported
 	From kapi.ObjectReference

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" {