Merge pull request #1170 from tylerslaton/backport-catalog-error-flag

Bug 2095584: Backport `oc adm catalog mirror` --continue-on-error flag

contrib/completions/bash/oc

@@ -457,6 +457,8 @@ _oc_adm_catalog_mirror()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--continue-on-error")
+    local_nonpersistent_flags+=("--continue-on-error")
     flags+=("--dir=")
     two_word_flags+=("--dir")
     local_nonpersistent_flags+=("--dir")

pkg/cli/admin/catalog/mirror.go

@@ -106,10 +106,11 @@ type MirrorCatalogOptions struct {
 	*IndexImageMirrorerOptions
 	genericclioptions.IOStreams
 
-	DryRun       bool
-	ManifestOnly bool
-	IndexPath    string
-	TempDir      bool
+	DryRun          bool
+	ManifestOnly    bool
+	IndexPath       string
+	TempDir         bool
+	ContinueOnError bool
 
 	FromFileDir string
 	FileDir     string
@@ -173,6 +174,7 @@ func NewMirrorCatalog(f kcmdutil.Factory, streams genericclioptions.IOStreams) *
 	flags.IntVar(&o.MaxPathComponents, "max-components", 2, "The maximum number of path components allowed in a destination mapping. Example: `quay.io/org/repo` has two path components.")
 	flags.StringVar(&o.IcspScope, "icsp-scope", o.IcspScope, "Scope of registry mirrors in imagecontentsourcepolicy file. Allowed values: repository, registry. Defaults to: repository")
 	flags.IntVar(&o.MaxICSPSize, "max-icsp-size", maxICSPSize, "The maximum number of bytes for the generated ICSP yaml(s). Defaults to 250000")
+	flags.BoolVar(&o.ContinueOnError, "continue-on-error", true, "If an error occurs while mirroring, keep going and attempt to mirror as much as possible.")
 	return cmd
 }
 
@@ -309,7 +311,7 @@ func (o *MirrorCatalogOptions) Complete(cmd *cobra.Command, args []string) error
 		}
 		a := imgmirror.NewMirrorImageOptions(o.IOStreams)
 		a.SkipMissing = true
-		a.ContinueOnError = true
+		a.ContinueOnError = o.ContinueOnError
 		a.DryRun = o.DryRun
 		a.SecurityOptions = o.SecurityOptions
 		// because images in the catalog are statically referenced by digest,
@@ -322,10 +324,10 @@ func (o *MirrorCatalogOptions) Complete(cmd *cobra.Command, args []string) error
 		a.Mappings = mappings
 		a.SkipMultipleScopes = true
 		if err := a.Validate(); err != nil {
-			fmt.Fprintf(o.IOStreams.ErrOut, "error configuring image mirroring: %v\n", err)
+			return fmt.Errorf("error configuring image mirroring: %v", err)
 		}
 		if err := a.Run(); err != nil {
-			fmt.Fprintf(o.IOStreams.ErrOut, "error mirroring image: %v\n", err)
+			return fmt.Errorf("error mirroring image: %v", err)
 		}
 		return nil
 	}
@@ -559,7 +561,11 @@ func (o *MirrorCatalogOptions) Run() error {
 	}
 	mapping, err := indexMirrorer.Mirror()
 	if err != nil {
-		fmt.Fprintf(o.IOStreams.ErrOut, "errors during mirroring. the full contents of the catalog may not have been mirrored: %s\n", err.Error())
+		err = fmt.Errorf("errors during mirroring. the full contents of the catalog may not have been mirrored: %v", err)
+		if !o.ContinueOnError {
+			return err
+		}
+		fmt.Fprintln(o.IOStreams.ErrOut, err.Error())
 	}
 
 	return WriteManifests(o.IOStreams.Out, o.SourceRef, o.DestRef, o.ManifestDir, o.IcspScope, o.MaxICSPSize, mapping)