Skip to content

OCPBUGS-53005: rename 'master' to 'main' for cluster-api#79415

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
thiagoalessio:OCPBUGS-53005_cluster-api_master-to-main
May 21, 2026
Merged

OCPBUGS-53005: rename 'master' to 'main' for cluster-api#79415
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
thiagoalessio:OCPBUGS-53005_cluster-api_master-to-main

Conversation

@thiagoalessio
Copy link
Copy Markdown
Member

This PR is in support of renaming the default branch for https://github.com/openshift/cluster-api from 'master' to 'main'.

Unhold this PR only when:

the default branch for https://github.com/openshift/cluster-api has been renamed to 'main'
You have verified that the CI jobs are working as expected either by running '/pj-rehearse' or by inspection.

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 18, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 18, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@thiagoalessio: This pull request references Jira Issue OCPBUGS-53005, which is invalid:

  • expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.20.z" instead

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:

This PR is in support of renaming the default branch for https://github.com/openshift/cluster-api from 'master' to 'main'.

Unhold this PR only when:

the default branch for https://github.com/openshift/cluster-api has been renamed to 'main'
You have verified that the CI jobs are working as expected either by running '/pj-rehearse' or by inspection.

/hold

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.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 18, 2026

Warning

Rate limit exceeded

@thiagoalessio has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 20 minutes and 45 seconds before requesting another review.

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 53769782-02ed-4895-922e-2bb9774dd894

📥 Commits

Reviewing files that changed from the base of the PR and between bff127d and 3944798.

⛔ Files ignored due to path filters (4)
  • ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-postsubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-presubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-postsubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (3)
  • ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-main.yaml
  • ci-operator/config/openshift/cluster-api/openshift-cluster-api-main.yaml
  • ci-operator/config/openshift/cluster-api/openshift-cluster-api-main__okd-scos.yaml
✨ 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 and usage tips.

@openshift-ci openshift-ci Bot requested review from damdo and droslean May 18, 2026 12:57
Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 18, 2026
@thiagoalessio thiagoalessio force-pushed the OCPBUGS-53005_cluster-api_master-to-main branch from 8e6fb3b to 3944798 Compare May 21, 2026 08:52
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label May 21, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@thiagoalessio: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-cluster-api-main-e2e-aws-capi-techpreview openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-aws-ovn openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-aws-ovn-techpreview openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-aws-serial-1of2 openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-aws-serial-2of2 openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-azure-capi-techpreview openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-gcp-capi-techpreview openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-hypershift openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-openstack-capi-techpreview openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-vsphere-capi-techpreview openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-e2e-vsphere-staticip-ipam-ovn openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-images openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-okd-scos-e2e-aws-ovn openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-okd-scos-images openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-regression-clusterinfra-aws-ipi-techpreview-capi openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-unit openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-verify openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-verify-commits openshift/cluster-api presubmit Presubmit changed
pull-ci-openshift-cluster-api-main-verify-deps openshift/cluster-api presubmit Presubmit changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@damdo
Copy link
Copy Markdown
Member

damdo commented May 21, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 21, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo, thiagoalessio

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

The pull request process is described 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

@thiagoalessio
Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-cluster-api-main-images

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@thiagoalessio: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

@thiagoalessio: 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.

@thiagoalessio
Copy link
Copy Markdown
Member Author

/pj-rehearse ack
/hold cancel

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@thiagoalessio: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 21, 2026
@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 21, 2026
@damdo
Copy link
Copy Markdown
Member

damdo commented May 21, 2026

/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 May 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@damdo: This pull request references Jira Issue OCPBUGS-53005, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: sunzhaohua2.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

@damdo: This pull request references Jira Issue OCPBUGS-53005, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

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.

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 4f433ec into openshift:main May 21, 2026
17 checks passed
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@thiagoalessio: Jira Issue OCPBUGS-53005: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-53005 has not been moved to the MODIFIED state.

Details

In response to this:

This PR is in support of renaming the default branch for https://github.com/openshift/cluster-api from 'master' to 'main'.

Unhold this PR only when:

the default branch for https://github.com/openshift/cluster-api has been renamed to 'main'
You have verified that the CI jobs are working as expected either by running '/pj-rehearse' or by inspection.

/hold

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.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants