Skip to content
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.

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

Migrate to new default branch name #50

Closed
16 tasks done
spiffxp opened this issue Apr 1, 2021 · 7 comments
Closed
16 tasks done

Migrate to new default branch name #50

spiffxp opened this issue Apr 1, 2021 · 7 comments
Assignees
Labels
kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience.

Comments

@spiffxp
Copy link
Member

spiffxp commented Apr 1, 2021

Part of umbrella issue to rename default branches: kubernetes/org#2222

Copy-pasted checklist from https://raw.githubusercontent.com/kubernetes/community/master/github-management/default-branch-migration.md

Changes pre-rename

Make the following changes before renaming the branch the master branch.

Note: There might be additional changes required that have not been
covered in this checklist.

Anytime

These changes are non-disruptive and can be made anytime before
renaming the branch.

Just before rename

These changes are disruptive and should be made just before
renaming the branch.

  • If a prowjob mentions the master branch in base_ref,
    update it to the main branch. For a periodic job, ensure that
    the branch is renamed between periodic job runs.

    • n/a - no jobs do this
  • If a prowjob mentions master in its name, rename the job to
    to not include the branch name. [status-reconciler] should automatically
    migrate the PR status contexts to the new job name but this has not been tested yet.
    The job with the new name will also appear as a differt job in Testgrid.

    • n/a - no slack-infra jobs do this
  • If a prowjob calls scripts or code in your repo that explicitly
    reference master, update all references to use main.

  • If the repo has netlify configured for it, ask a member of the GitHub
    Management Team to rename the master branch to main in the netlify site config.
    It can't be controlled through the netlify config in the repo.

    • n/a - no netlify

Approval

  • Once all non-disruptive tasks have been completed and disruptive tasks
    have been identified, assign the GitHub Management team ([@kubernetes/owners])
    for approval.
    • verbally asked during github management meeting

Rename the default branch

Changes post-rename

After the default branch has been renamed to main, make the following
changes.

Note: There might be additional changes required that have not been
covered in this checklist.

Prowjobs

Prow config

  • If the [milestone_applier] prow config references the master branch,
    remove it from the config.

    • n/a
  • If the [branch_protection] prow config references the master branch,
    remove it from the config.

    • n/a

Other

/assign
/sig contributor-experience
/kind cleanup

@k8s-ci-robot k8s-ci-robot added sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Apr 1, 2021
@nikhita
Copy link
Member

nikhita commented Apr 1, 2021

+1 from github management team hat on

@spiffxp
Copy link
Member Author

spiffxp commented Apr 1, 2021

I've been updating description as I go. Dropped TODO's on what remains. I'm going to try and update k/community docs before closing this out. I'll post further updates as comments, not just description edits

@spiffxp
Copy link
Member Author

spiffxp commented Apr 1, 2021

Opened kubernetes/community#5687 and kubernetes/test-infra#21617 to close out the actual rename part of this, leaving notification, and then updating the branch rename docs as a followup

@fejta-bot
Copy link

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.

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

Send feedback to sig-contributor-experience at kubernetes/community.
/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 30, 2021
@spiffxp
Copy link
Member Author

spiffxp commented Jun 30, 2021

/remove-lifecycle stale

@k8s-ci-robot k8s-ci-robot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 30, 2021
@spiffxp
Copy link
Member Author

spiffxp commented Jun 30, 2021

@k8s-ci-robot
Copy link
Contributor

@spiffxp: Closing this issue.

In response to this:

/close
Mailing list notification sent: https://groups.google.com/g/kubernetes-sig-contribex/c/rRnvJh2WROc/m/acEQqPODAQAJ

No remaining references to the old branch: https://cs.k8s.io/?q=slack-infra.*master&i=nope&files=&excludeFiles=&repos=

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience.
Projects
None yet
Development

No branches or pull requests

4 participants