Merge pull request #2040 from wking/accepted-via-ConditionalUpdateRisk

openshift-merge-bot[bot] · web-flow · commit 9808979437d2 · 2025-07-17T15:23:09.000Z
OTA-1575: pkg/cli/admin/upgrade/recommend: "accepted ... via ConditionalUpdateRisk"
diff --git a/pkg/cli/admin/upgrade/recommend/recommend.go b/pkg/cli/admin/upgrade/recommend/recommend.go
@@ -333,11 +333,11 @@ func (o *options) Run(ctx context.Context) error {
 						}
 					} else {
 						if !o.quiet {
-							acceptContext := ""
+							reason := c.Reason
 							if accept.Has("ConditionalUpdateRisk") {
-								acceptContext = "accepted "
+								reason = fmt.Sprintf("accepted %s via ConditionalUpdateRisk", c.Reason)
 							}
-							fmt.Fprintf(o.Out, "Update to %s %s=%s:\nImage: %s\nRelease URL: %s\nReason: %s%s\nMessage: %s\n", update.Release.Version, c.Type, c.Status, update.Release.Image, update.Release.URL, acceptContext, c.Reason, strings.ReplaceAll(c.Message, "\n", "\n  "))
+							fmt.Fprintf(o.Out, "Update to %s %s=%s:\nImage: %s\nRelease URL: %s\nReason: %s\nMessage: %s\n", update.Release.Version, c.Type, c.Status, update.Release.Image, update.Release.URL, reason, strings.ReplaceAll(c.Message, "\n", "\n  "))
 						}
 						issues.Insert("ConditionalUpdateRisk")
 					}

Original file line number	Diff line number	Diff line change
`@@ -333,11 +333,11 @@ func (o *options) Run(ctx context.Context) error {`
`333`	`333`	`}`
`334`	`334`	`} else {`
`335`	`335`	`if !o.quiet {`
`336`		`- acceptContext := ""`
	`336`	`+ reason := c.Reason`
`337`	`337`	`if accept.Has("ConditionalUpdateRisk") {`
`338`		`- acceptContext = "accepted "`
	`338`	`+ reason = fmt.Sprintf("accepted %s via ConditionalUpdateRisk", c.Reason)`
`339`	`339`	`}`
`340`		`- fmt.Fprintf(o.Out, "Update to %s %s=%s:\nImage: %s\nRelease URL: %s\nReason: %s%s\nMessage: %s\n", update.Release.Version, c.Type, c.Status, update.Release.Image, update.Release.URL, acceptContext, c.Reason, strings.ReplaceAll(c.Message, "\n", "\n "))`
	`340`	`+ fmt.Fprintf(o.Out, "Update to %s %s=%s:\nImage: %s\nRelease URL: %s\nReason: %s\nMessage: %s\n", update.Release.Version, c.Type, c.Status, update.Release.Image, update.Release.URL, reason, strings.ReplaceAll(c.Message, "\n", "\n "))`
`341`	`341`	`}`
`342`	`342`	`issues.Insert("ConditionalUpdateRisk")`
`343`	`343`	`}`