Merge pull request #22747 from sanchezl/must-gather_default_image

openshift-merge-robot · web-flow · commit 7e95f8675d2c · 2019-05-03T07:29:09.000+02:00
fallback to quay.io/openshift/origin-must-gather:latest
diff --git a/pkg/oc/cli/admin/mustgather/mustgather.go b/pkg/oc/cli/admin/mustgather/mustgather.go
@@ -108,7 +108,8 @@ func (o *MustGatherOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, arg
 		}
 		var ok bool
 		if o.Image, ok = util.ResolveLatestTaggedImage(imageStream, "latest"); !ok {
-			return fmt.Errorf("unable to to resolve must-gather image")
+			o.Image = "quay.io/openshift/origin-must-gather:latest"
+			fmt.Fprintf(o.Out, "Unable to resolve the openshift imagestream tag must-gather:latest; Using %s image instead.", o.Image)
 		}
 	}
 	o.PrinterCreated, err = printers.NewTypeSetter(scheme.Scheme).WrapToPrinter(&printers.NamePrinter{Operation: "created"}, nil)

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ func (o MustGatherOptions) Complete(f kcmdutil.Factory, cmd cobra.Command, arg`
`108`	`108`	`}`
`109`	`109`	`var ok bool`
`110`	`110`	`if o.Image, ok = util.ResolveLatestTaggedImage(imageStream, "latest"); !ok {`
`111`		`- return fmt.Errorf("unable to to resolve must-gather image")`
	`111`	`+ o.Image = "quay.io/openshift/origin-must-gather:latest"`
	`112`	`+ fmt.Fprintf(o.Out, "Unable to resolve the openshift imagestream tag must-gather:latest; Using %s image instead.", o.Image)`
`112`	`113`	`}`
`113`	`114`	`}`
`114`	`115`	`o.PrinterCreated, err = printers.NewTypeSetter(scheme.Scheme).WrapToPrinter(&printers.NamePrinter{Operation: "created"}, nil)`