Merge pull request #1572 from aleskandro/mirror-release

OCPBUGS-20474: Set ImportPolicy to PreserveOriginal to honor --keep-manifest-list when mirroring a payload to an image stream

pkg/cli/admin/release/mirror.go

@@ -681,6 +681,10 @@ func (o *MirrorOptions) Run(ctx context.Context) error {
 		hasErrors := make(map[string]error)
 		maxPerIteration := 12
 
+		importMode := imagev1.ImportModeLegacy
+		if o.KeepManifestList {
+			importMode = imagev1.ImportModePreserveOriginal
+		}
 		for retries := 4; (len(remaining) > 0 || len(hasErrors) > 0) && retries > 0; {
 			if len(remaining) == 0 {
 				for _, mapping := range mappings {
@@ -712,6 +716,9 @@ func (o *MirrorOptions) Run(ctx context.Context) error {
 						To: &corev1.LocalObjectReference{
 							Name: mapping.Name,
 						},
+						ImportPolicy: imagev1.TagImportPolicy{
+							ImportMode: importMode,
+						},
 					})
 					if len(isi.Spec.Images) > maxPerIteration {
 						break