Skip to content

pkg/cli/admin/upgrade: Add post-period to space to some error messages #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 19, 2023
Merged

pkg/cli/admin/upgrade: Add post-period to space to some error messages #1330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
pkg/cli/admin/upgrade: Add post-period to space to some error messages 
Cleaning up some nits from 6c8d935 (Adding the flag
--allow-not-recommended to oc adm upgrade, 2021-12-16, #986).
  • Loading branch information
@wking
wking committed Jan 26, 2023
commit 6a9508c66d60b94f2d9487b9df3263dc702025dd
4 changes: 2 additions & 2 deletions pkg/cli/admin/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func (o *Options) Run() error {
if c := findCondition(upgrade.Conditions, "Recommended"); c != nil && c.Status != metav1.ConditionTrue {
if match, err := targetMatch(&upgrade.Release, o.To, o.ToImage); match && err == nil {
if !o.AllowNotRecommended {
return fmt.Errorf("the update %s is not one of the recommended updates, but is available as a conditional update."+
return fmt.Errorf("the update %s is not one of the recommended updates, but is available as a conditional update. "+
"To accept the %s=%s risk and to proceed with update use --allow-not-recommended.\n Reason: %s\n Message: %s\n",
upgrade.Release.Version, c.Type, c.Status, c.Reason, strings.ReplaceAll(c.Message, "\n", "\n "))
}
Expand All @@ -287,7 +287,7 @@ func (o *Options) Run() error {
Version: "",
Image: o.ToImage,
}
fmt.Fprintln(o.ErrOut, "warning: The requested upgrade image is not one of the available updates."+
fmt.Fprintln(o.ErrOut, "warning: The requested upgrade image is not one of the available updates. "+
"You have used --allow-explicit-upgrade for the update to proceed anyway")
}

Expand Down