Merge pull request #22786 from damemi/fix-force

openshift-merge-robot · web-flow · commit bb1b9b5223dd · 2019-05-09T09:31:32.000+02:00
Allow oc adm upgrade with --force even if versions match
diff --git a/pkg/oc/cli/admin/upgrade/upgrade.go b/pkg/oc/cli/admin/upgrade/upgrade.go
@@ -206,7 +206,7 @@ func (o *Options) Run() error {
 			}
 		}
 		if len(o.ToImage) > 0 {
-			if o.ToImage == cv.Status.Desired.Image {
+			if o.ToImage == cv.Status.Desired.Image && !o.Force {
 				fmt.Fprintf(o.Out, "info: Cluster is already using release image %s\n", o.ToImage)
 				return nil
 			}

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ func (o *Options) Run() error {`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`	`if len(o.ToImage) > 0 {`
`209`		`- if o.ToImage == cv.Status.Desired.Image {`
	`209`	`+ if o.ToImage == cv.Status.Desired.Image && !o.Force {`
`210`	`210`	`fmt.Fprintf(o.Out, "info: Cluster is already using release image %s\n", o.ToImage)`
`211`	`211`	`return nil`
`212`	`212`	`}`