Skip to content

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

Open
DennisPeriquet wants to merge 2 commits intoopenshift:mainfrom
DennisPeriquet:OCPBUGS-53005_cluster-api_master-1
Open

OCPBUGS-53005: rename 'master' to 'main' for cluster-api#62707
DennisPeriquet wants to merge 2 commits intoopenshift:mainfrom
DennisPeriquet:OCPBUGS-53005_cluster-api_master-1

Conversation

@DennisPeriquet
Copy link
Contributor

@DennisPeriquet DennisPeriquet commented Mar 12, 2025

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:

/hold

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Mar 12, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 12, 2025

@DennisPeriquet: This pull request references Jira Issue OCPBUGS-53005, 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 (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

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:

/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.

@openshift-ci openshift-ci bot requested a review from sunzhaohua2 March 12, 2025 10:30
@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 Mar 12, 2025
@openshift-ci openshift-ci bot requested review from droslean and elmiko March 12, 2025 10:32
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 9481fb8 to 6a8c686 Compare March 25, 2025 20:47
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch 2 times, most recently from e5cea06 to 0dcd361 Compare April 7, 2025 15:33
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 7, 2025
@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Apr 7, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 0dcd361 to 52c1230 Compare April 7, 2025 18:25
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 7, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 52c1230 to 695fb60 Compare April 23, 2025 17:45
@openshift-ci-robot openshift-ci-robot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Apr 23, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 695fb60 to 7b7219a Compare May 12, 2025 13:37
This was referenced May 12, 2025
Open
Closed
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 7b7219a to ba76add Compare May 17, 2025 14:27
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from ba76add to 54b4195 Compare June 2, 2025 19:29
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 54b4195 to 93feaf6 Compare June 23, 2025 21:50
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch 2 times, most recently from 2bfe070 to 06a8193 Compare July 14, 2025 17:54
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 06a8193 to 4a8e6d7 Compare July 18, 2025 12:06
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 4a8e6d7 to 5358236 Compare August 4, 2025 15:02
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 5358236 to b17daaf Compare August 28, 2025 21:44
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from b17daaf to b3e3232 Compare September 11, 2025 15:41
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 6, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: DennisPeriquet
Once this PR has been reviewed and has the lgtm label, please assign chrischdi 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

@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Oct 13, 2025

/remove-lifecycle stale

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 13, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 1eb3dc7 to 185e216 Compare October 13, 2025 11:31
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 13, 2025
@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 12, 2025

Issues in openshift/release go stale after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 15d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 12, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 12, 2025
@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 27, 2025

Stale issue in openshift/release rot after 15d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 15d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

@openshift-ci openshift-ci bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Nov 27, 2025
@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Nov 29, 2025

/remove-lifecycle rotten

@openshift-ci openshift-ci bot removed the lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. label Nov 29, 2025
@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Nov 29, 2025

/lifecycle frozen

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 29, 2025

@DennisPeriquet: The lifecycle/frozen label cannot be applied to Pull Requests.

Details

In response to this:

/lifecycle frozen

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.

@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 185e216 to 9ae10f6 Compare November 29, 2025 15:46
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 29, 2025
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 29, 2025

Issues in openshift/release go stale after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 15d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 29, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 29, 2025
@DennisPeriquet DennisPeriquet force-pushed the OCPBUGS-53005_cluster-api_master-1 branch from 9ae10f6 to 41e4be9 Compare December 29, 2025 21:24
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 29, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 29, 2025

[REHEARSALNOTIFIER]
@DennisPeriquet: 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-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.

@DennisPeriquet
Copy link
Contributor Author

DennisPeriquet commented Dec 29, 2025

/remove-lifecycle stale

@openshift-ci openshift-ci bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 29, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 28, 2026

@DennisPeriquet: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/yamllint 41e4be9 link true /test yamllint

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.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 28, 2026
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Jan 28, 2026

PR needs rebase.

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.

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

Reviewers

@sunzhaohua2 sunzhaohua2 Awaiting requested review from sunzhaohua2

@droslean droslean Awaiting requested review from droslean

@elmiko elmiko Awaiting requested review from elmiko

Assignees

No one assigned

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@DennisPeriquet @openshift-ci-robot @openshift-bot @openshift-merge-robot