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

KEP-2853: Branch rename for k/k #3053

Merged
merged 4 commits into from
Feb 14, 2022
Merged

Conversation

cpanato
Copy link
Member

@cpanato cpanato commented Nov 19, 2021

  • One-line PR description: Changing kubernetes/kubernetes default branch name to main
  • Other comments:

@saschagrunert @justaugustus @puerco @xmudrii @Verolop
@kubernetes/release-engineering

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. kind/kep Categorizes KEP tracking issues and PRs modifying the KEP directory labels Nov 19, 2021
@k8s-ci-robot k8s-ci-robot added sig/release Categorizes an issue or PR as relevant to SIG Release. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 19, 2021
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

Thanks for laying out the KEP, I left a few review suggestions 🙏

@justaugustus
Copy link
Member

/assign @justaugustus @saschagrunert

Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

Just a few nits, otherwise LGTM :)

Signed-off-by: Carlos Panato <ctadeu@gmail.com>
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
@cpanato cpanato force-pushed the KEP-2853 branch 2 times, most recently from 47fd2ca to 859218f Compare February 9, 2022 10:18

- https://github.com/github/renaming

### Risks and Mitigations
Copy link
Member

Choose a reason for hiding this comment

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

Have we done any research on how is it going to affect us (speaking of Release Engineering)? For example:

  • What changes we might need to do to krel and the release tooling?
  • What about the release notes tool?
  • What about the version markers (could they be affected by this)?

Copy link
Member Author

Choose a reason for hiding this comment

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

What changes we might need to do to krel and the release tooling?
What about the release notes tool?

we will need to update some default const we have to use main, or do some fallback if fail, like try master and if fail go to main, or otherwise

What about the version markers (could they be affected by this)?

regarding this maybe @saschagrunert or @justaugustus can give some opinion, I'm not expert in this topic :(

Copy link
Member

Choose a reason for hiding this comment

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

Any tooling would require to be adapted. So there is a risk we miss some of them, which can be mitigated by grepping with multiple eyes :)

Copy link
Member Author

Choose a reason for hiding this comment

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

will add this as a risk and mitigation plans

nitty-gritty.
-->
- We aim to make the change during the start of v1.25 release (spring 2022).
- Perform a Survey to gather information on downstream consumers and how this might affects their workflow. See [Survey Questions](#survey-questions).
Copy link
Member

Choose a reason for hiding this comment

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

I'm wondering should the survey cover the upstream consumers as well. For example, there might be SIGs and/or projects under kubernetes* orgs that are affected by this change. IMO, we also want to be sure that they can migrate by the start of the v1.25 release cycle. We should also note that the upstream consumers might be affected by the enhancements and code freeze.

Copy link
Member Author

Choose a reason for hiding this comment

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

we can as well.
I already did the first check in the jobs that use k/k and update those to support both branches when using the master name.
but in some jobs we will need to update after the change.

however, if a project uses k/k that is not set in a prow job we will need to discover those and while we are doing the survey can be a good time for that :)

Signed-off-by: Carlos Panato <ctadeu@gmail.com>
Copy link
Member

@justaugustus justaugustus left a comment

Choose a reason for hiding this comment

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

@cpanato -- Great work here!

Let's merge and iterate over any remaining feedback, since this is still in provisional state.
/lgtm
/approve

That said, consider a shorter file name?

keps/sig-release/2853-kubernetes-kubernetes-repository-branch-rename/README.md --> keps/sig-release/2853-k-core-branch-rename/README.md

/hold if you want to address that now

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Feb 10, 2022
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 13, 2022
@cpanato
Copy link
Member Author

cpanato commented Feb 13, 2022

did the rename of the directory @justaugustus, PTAL

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 13, 2022
Copy link
Member

@justaugustus justaugustus left a comment

Choose a reason for hiding this comment

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

Thanks again for working on this, Carlos!
/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 14, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, justaugustus

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

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot merged commit 35bf13f into kubernetes:master Feb 14, 2022
SIG Release automation moved this from In progress to Done/Closed Feb 14, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Feb 14, 2022
@cpanato cpanato deleted the KEP-2853 branch February 14, 2022 12:05
@cpanato cpanato changed the title KEP-2853: Initial Draft of branch rename for k/k KEP-2853: Branch rename for k/k Mar 15, 2022
authors:
- "@cpanato"
owning-sig: sig-release
participating-sigs:
Copy link
Member

Choose a reason for hiding this comment

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

In the future I would bring a KEP to participating SIGs before merging it.
This will have impact well beyond SIG Release.

- Perform a Survey to gather information on downstream consumers and how this might affects their workflow. See [Survey Questions](#survey-questions).
- Announce the change in the kubernetes-dev and kubernetes-announcement mailing list and in a blog post. As well as use Twitter and other social media to announce.
- Change all open Pull Requests to `Draft mode` (so that when we rename the branch, tests will not be triggered, and we avoid a massive queue in the CI infrastructure).
- Update all Prow jobs that use `kubernetes/kubernetes` and use the `master` branch to listen to the `main` branch as well
Copy link
Member

Choose a reason for hiding this comment

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

This is an incomplete answer due to periodics. They don’t listen to a branch, only time, but they must explicitly configure a branch to clone. Thankfully many of them consume a CI build instead, but not remotely all of them.

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/kep Categorizes KEP tracking issues and PRs modifying the KEP directory lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
No open projects
SIG Release
  
Done/Closed
Development

Successfully merging this pull request may close these issues.

None yet

7 participants