OCPBUGS-73844: Let import mode be decided by the cluster when not specified

Today, we default to "Legacy" importmode when no option is specified.
With the introduction of
https://issues.redhat.com/browse/MULTIARCH-4552, the importmode is
determined by the Cluster version's `desired.architecture` - which if
set to "Multi", the import mode is PreserveOriginal else Legacy. Hence
we don't need to default to Legacy all the time.

Author: Prashanth684

pkg/cli/importimage/importimage.go

@@ -100,7 +100,6 @@ func NewImportImageOptions(streams genericiooptions.IOStreams) *ImportImageOptio
 		PrintFlags:      genericclioptions.NewPrintFlags("imported"),
 		IOStreams:       streams,
 		ReferencePolicy: tag.SourceReferencePolicy,
-		ImportMode:      string(imagev1.ImportModeLegacy),
 	}
 }
 
@@ -129,7 +128,7 @@ func NewCmdImportImage(f kcmdutil.Factory, streams genericiooptions.IOStreams) *
 	cmd.Flags().BoolVar(&o.Confirm, "confirm", o.Confirm, "If true, allow the image stream import location to be set or changed")
 	cmd.Flags().BoolVar(&o.All, "all", o.All, "If true, import all tags from the provided source on creation or if --from is specified")
 	cmd.Flags().StringVar(&o.ReferencePolicy, "reference-policy", o.ReferencePolicy, "Allow to request pullthrough for external image when set to 'local'. Defaults to 'source'.")
-	cmd.Flags().StringVar(&o.ImportMode, "import-mode", o.ImportMode, "Imports the full manifest list of a tag when set to 'PreserveOriginal'. Defaults to 'Legacy'.")
+	cmd.Flags().StringVar(&o.ImportMode, "import-mode", o.ImportMode, "Imports the full manifest list of a tag when set to 'PreserveOriginal'. When set to 'Legacy', imports a single sub-manifest. When unspecified, the cluster determines the import mode.")
 	cmd.Flags().BoolVar(&o.DryRun, "dry-run", o.DryRun, "Fetch information about images without creating or updating an image stream.")
 	cmd.Flags().BoolVar(&o.Scheduled, "scheduled", o.Scheduled, "Set each imported container image to be periodically imported from a remote repository. Defaults to false.")
 	cmd.Flags().BoolVar(&o.Insecure, "insecure", o.Insecure, "If true, allow importing from registries that have invalid HTTPS certificates or are hosted via HTTP. This flag will take precedence over the insecure annotation.")
@@ -218,7 +217,8 @@ func (o *ImportImageOptions) Validate() error {
 	case string(imagev1.ImportModeLegacy):
 	case string(imagev1.ImportModePreserveOriginal):
 	case "":
-		o.ImportMode = string(imagev1.ImportModeLegacy)
+		// Leave empty and let it be decided based on the ClusterVersion's "desired.architecture" value. If the value is "Multi",
+		// the import mode is set to "PreserveOriginal", if not it is set to "Legacy"
 	default:
 		return fmt.Errorf("valid ImportMode values are %s or %s", imagev1.ImportModeLegacy, imagev1.ImportModePreserveOriginal)
 	}

pkg/cli/newapp/newapp.go

@@ -302,7 +302,7 @@ func NewCmdNewApplication(f kcmdutil.Factory, streams genericiooptions.IOStreams
 	cmd.Flags().StringVar(&o.Config.SourceSecret, "source-secret", o.Config.SourceSecret, "The name of an existing secret that should be used for cloning a private git repository.")
 	cmd.Flags().BoolVar(&o.Config.SkipGeneration, "no-install", o.Config.SkipGeneration, "Do not attempt to run images that describe themselves as being installable")
 	cmd.Flags().BoolVar(&o.Config.BinaryBuild, "binary", o.Config.BinaryBuild, "Instead of expecting a source URL, set the build to expect binary contents. Will disable triggers.")
-	cmd.Flags().StringVar(&o.Config.ImportMode, "import-mode", o.Config.ImportMode, "Imports the full manifest list of a tag when set to 'PreserveOriginal'. Defaults to 'Legacy'.")
+	cmd.Flags().StringVar(&o.Config.ImportMode, "import-mode", o.Config.ImportMode, "Imports the full manifest list of a tag when set to 'PreserveOriginal'. When set to 'Legacy', imports a single sub-manifest. When unspecified, the cluster determines the import mode.")
 
 	o.Action.BindForOutput(cmd.Flags(), "output", "template")
 	cmd.Flags().String("output-version", "", "The preferred API versions of the output objects")

pkg/cli/newbuild/newbuild.go

@@ -158,7 +158,7 @@ func NewCmdNewBuild(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cob
 	cmd.Flags().BoolVar(&o.Config.NoOutput, "no-output", o.Config.NoOutput, "If true, the build output will not be pushed anywhere.")
 	cmd.Flags().StringVar(&o.Config.SourceImage, "source-image", o.Config.SourceImage, "Specify an image to use as source for the build.  You must also specify --source-image-path.")
 	cmd.Flags().StringVar(&o.Config.SourceImagePath, "source-image-path", o.Config.SourceImagePath, "Specify the file or directory to copy from the source image and its destination in the build directory. Format: [source]:[destination-dir].")
-	cmd.Flags().StringVar(&o.Config.ImportMode, "import-mode", o.Config.ImportMode, "Imports the full manifest list of a tag when set to 'PreserveOriginal'. Defaults to 'Legacy'.")
+	cmd.Flags().StringVar(&o.Config.ImportMode, "import-mode", o.Config.ImportMode, "Imports the full manifest list of a tag when set to 'PreserveOriginal'. When set to 'Legacy', imports a single sub-manifest. When unspecified, the cluster determines the import mode.")
 
 	o.Action.BindForOutput(cmd.Flags(), "output", "template", "sort-by")
 	cmd.Flags().String("output-version", "", "The preferred API versions of the output objects")

pkg/cli/tag/tag.go

@@ -116,7 +116,7 @@ func NewCmdTag(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Co
 	cmd.Flags().BoolVar(&o.scheduleTag, "scheduled", o.scheduleTag, "Set a container image to be periodically imported from a remote repository. Defaults to false.")
 	cmd.Flags().BoolVar(&o.insecureTag, "insecure", o.insecureTag, "Set to true if importing the specified container image requires HTTP or has a self-signed certificate. Defaults to false.")
 	cmd.Flags().StringVar(&o.referencePolicy, "reference-policy", SourceReferencePolicy, "Allow to request pullthrough for external image when set to 'local'. Defaults to 'source'.")
-	cmd.Flags().StringVar(&o.importMode, "import-mode", o.importMode, "Imports the full manifest list of a tag when set to 'PreserveOriginal'. Defaults to 'Legacy'.")
+	cmd.Flags().StringVar(&o.importMode, "import-mode", o.importMode, "Imports the full manifest list of a tag when set to 'PreserveOriginal'. When set to 'Legacy', imports a single sub-manifest. When unspecified, the cluster determines the import mode.")
 
 	return cmd
 }
@@ -367,7 +367,8 @@ func (o *TagOptions) Validate() error {
 	case string(imagev1.ImportModeLegacy):
 	case string(imagev1.ImportModePreserveOriginal):
 	case "":
-		o.importMode = string(imagev1.ImportModeLegacy)
+		// Leave empty and let it be decided based on the ClusterVersion's "desired.architecture" value. If the value is "Multi",
+		// the import mode is set to "PreserveOriginal", if not it is set to "Legacy"
 	default:
 		return fmt.Errorf("valid ImportMode values are %s or %s", imagev1.ImportModeLegacy, imagev1.ImportModePreserveOriginal)
 	}

pkg/cli/tag/tag_test.go

@@ -433,8 +433,9 @@ func TestRunTag_AddImportMode(t *testing.T) {
 				destNameAndTag:  []string{"rails:tip"},
 			},
 			expectedActions: []testActionWithImportMode{
-				{verb: "update", resource: "imagestreamtags", importMode: string(imagev1.ImportModeLegacy)},
-				{verb: "create", resource: "imagestreamtags", importMode: string(imagev1.ImportModeLegacy)},
+				// Empty import mode - let the cluster decide based on its configuration
+				{verb: "update", resource: "imagestreamtags", importMode: ""},
+				{verb: "create", resource: "imagestreamtags", importMode: ""},
 			},
 		},
 		"valid tag with import mode PreserveOriginal": {

pkg/helpers/newapp/cmd/newapp.go

@@ -888,7 +888,8 @@ func (c *AppConfig) Run() (*AppResult, error) {
 	case string(imagev1.ImportModeLegacy):
 	case string(imagev1.ImportModePreserveOriginal):
 	case "":
-		c.ImportMode = string(imagev1.ImportModeLegacy)
+		// Leave empty and let it be decided based on the ClusterVersion's "desired.architecture" value. If the value is "Multi",
+		// the import mode is set to "PreserveOriginal", if not it is set to "Legacy"
 	default:
 		return nil, fmt.Errorf("valid ImportMode values are %s or %s", imagev1.ImportModeLegacy, imagev1.ImportModePreserveOriginal)
 	}