Skip to content

OCPBUGS-8251: fix misleading --to-multi-arch messages - #2339

Open
savio87 wants to merge 2 commits into
openshift:mainfrom
savio87:OCPBUGS-8251
Open

OCPBUGS-8251: fix misleading --to-multi-arch messages#2339
savio87 wants to merge 2 commits into
openshift:mainfrom
savio87:OCPBUGS-8251

Conversation

@savio87

@savio87 savio87 commented Aug 4, 2026

Copy link
Copy Markdown

Summary

The oc adm upgrade --to-multi-arch command used the phrase "multi cluster architecture" in its success and error messages, which is misleading. Updated all three message strings to use the correct term "multi-architecture", consistent with the wording used in oc adm upgrade status.

Bug: https://redhat.atlassian.net/browse/OCPBUGS-8251

Changes

  • Flag help: "multi architecture" -> "multi-architecture"
  • Already-requested error: "info: Update to multi cluster architecture has already been requested" -> "Cluster has already been requested to update to multi-architecture"
  • Success message: "Requested update to multi cluster architecture" -> "Requested update to multi-architecture"

Summary by CodeRabbit

  • Documentation
    • Updated upgrade command flags and status messages to consistently use “multi-architecture” terminology.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Aug 4, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@savio87: This pull request references Jira Issue OCPBUGS-8251, which is invalid:

  • expected the bug to target the "5.0.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

The oc adm upgrade --to-multi-arch command used the phrase "multi cluster architecture" in its success and error messages, which is misleading. Updated all three message strings to use the correct term "multi-architecture", consistent with the wording used in oc adm upgrade status.

Bug: https://redhat.atlassian.net/browse/OCPBUGS-8251

Changes

  • Flag help: "multi architecture" -> "multi-architecture"
  • Already-requested error: "info: Update to multi cluster architecture has already been requested" -> "Cluster has already been requested to update to multi-architecture"
  • Success message: "Requested update to multi cluster architecture" -> "Requested update to multi-architecture"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 4, 2026
@openshift-ci
openshift-ci Bot requested review from ardaguclu and tchap August 4, 2026 06:53
@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 4, 2026
@openshift-ci

openshift-ci Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Hi @savio87. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@coderabbitai

coderabbitai Bot commented Aug 4, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 65b0c042-533a-43d2-ae75-8a1063644be6

📥 Commits

Reviewing files that changed from the base of the PR and between be748e3 and 4ec0c86.

📒 Files selected for processing (1)
  • pkg/cli/admin/upgrade/upgrade.go
🚧 Files skipped from review as they are similar to previous changes (1)
  • pkg/cli/admin/upgrade/upgrade.go

Walkthrough

The upgrade command updates its multi-architecture flag help text and status messages. The changes only revise terminology. Functional behavior remains unchanged.

Changes

Multi-architecture upgrade messaging

Layer / File(s) Summary
Upgrade message terminology
pkg/cli/admin/upgrade/upgrade.go
The --to-multi-arch help text and multi-architecture request messages now use consistent hyphenated terminology.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Suggested reviewers: ardaguclu

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the issue and summarizes the changes to misleading --to-multi-arch messages.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The PR changes only three user-facing strings in upgrade.go and adds no test files or Ginkgo test-title calls.
Test Structure And Quality ✅ Passed The pull request changes only production message text in upgrade.go; it adds no Ginkgo tests, cluster operations, waits, or assertions to review.
Microshift Test Compatibility ✅ Passed The pull request changes one production string in upgrade.go and adds no Ginkgo e2e tests, so MicroShift test compatibility does not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The pull request changes only one message string in upgrade.go and adds no Ginkgo e2e tests or other test files, so the SNO check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed The commit modifies only one output string in pkg/cli/admin/upgrade/upgrade.go; it adds no manifests, controllers, operators, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The PR changes only a message in Options.Run, using injected o.Out; it does not modify OTE main or suite setup, and no process-level stdout write was introduced.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The patch changes only one CLI message in upgrade.go; it adds no Ginkgo e2e tests, IPv4 assumptions, or external connectivity.
No-Weak-Crypto ✅ Passed The PR patch changes only one user-facing string in upgrade.go; it adds no crypto imports, algorithms, secret comparisons, or weak-crypto constructs.
Container-Privileges ✅ Passed The full PR diff changes only upgrade.go message strings; it adds no manifests or privilege settings such as privileged, hostPID, hostNetwork, SYS_ADMIN, or allowPrivilegeEscalation.
No-Sensitive-Data-In-Logs ✅ Passed The added log message contains only fixed upgrade-status text; it includes no passwords, tokens, keys, PII, hostnames, session IDs, or customer data.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@savio87

savio87 commented Aug 4, 2026

Copy link
Copy Markdown
Author

Small messaging fix — updates "multi cluster architecture" to "multi-architecture" to match the wording in oc adm upgrade status. Could a maintainer update the target version on OCPBUGS-8251 and run /ok-to-test? Thanks!

Comment thread pkg/cli/admin/upgrade/upgrade.go Outdated
return err
}
fmt.Fprintln(o.Out, "Requested update to multi cluster architecture")
fmt.Fprintln(o.Out, "Requested update to multi-architecture")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requested update to multi-architecture cluster sounds a bit more complete, thanks.

@savio87

savio87 commented Aug 7, 2026

Copy link
Copy Markdown
Author

Thanks @tchap! Updated the success message to "Requested update to multi-architecture cluster".

@tchap

tchap commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 7, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@tchap: This pull request references Jira Issue OCPBUGS-8251, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jianl@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@tchap

tchap commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 7, 2026
@tchap

tchap commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-agnostic-ovn-cmd
/test e2e-aws-ovn
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-upgrade

@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: savio87, tchap
Once this PR has been reviewed and has the lgtm label, please assign wking for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

@savio87: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants