Skip to content

Commit

Permalink
Merge pull request openshift#609 from pvasant/fixcosmeticissue
Browse files Browse the repository at this point in the history
sda-5379-rosa upgrade enhancements
  • Loading branch information
openshift-merge-robot authored Feb 16, 2022
2 parents f746b7b + c4ae461 commit 3e9660e
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/upgrade/accountroles/cmd.go
Original file line number Diff line number Diff line change
@@ -245,7 +245,7 @@ func upgradeAccountRolePolicies(reporter *rprtr.Object, awsClient aws.Client, pr
}

func upgradeOperatorRolePolicies(reporter *rprtr.Object, awsClient aws.Client, accountID string, prefix string) error {
if !confirm.Prompt(true, "Upgrade the operator role policies to version %s?", aws.DefaultPolicyVersion) {
if !confirm.Prompt(true, "Upgrade the operator role policy to version %s?", aws.DefaultPolicyVersion) {
if args.isInvokedFromClusterUpgrade {
return reporter.Errorf("Operator roles need to be upgraded to proceed" +
"")
2 changes: 1 addition & 1 deletion cmd/upgrade/cluster/cmd.go
Original file line number Diff line number Diff line change
@@ -284,7 +284,7 @@ func run(cmd *cobra.Command, _ []string) {
accountRoleStr := fmt.Sprintf("rosa upgrade account-roles --prefix %s", prefix)
operatorRoleStr := fmt.Sprintf("rosa upgrade operator-roles -c %s", clusterKey)

reporter.Infof("Account and/Or Operator Role policies are not valid with upgrade version %s. "+
reporter.Infof("Account and/or Operator Role policies are not valid with upgrade version %s. "+
"Run the following command(s) to upgrade the roles:\n\n"+
"\t%s\n"+
"\t%s\n", version, accountRoleStr, operatorRoleStr)

0 comments on commit 3e9660e

Please sign in to comment.