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

cpanato · 2021-11-19T09:23:57Z

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

Issue link: Changing kubernetes/kubernetes default branch name to main #2853

Other comments:

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

saschagrunert

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

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

keps/sig-release/2853-kubernetes-kubernetes-repository-branch-rename/kep.yaml

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

justaugustus · 2022-01-25T16:18:39Z

/assign @justaugustus @saschagrunert

saschagrunert

Just a few nits, otherwise LGTM :)

keps/sig-release/2853-kubernetes-kubernetes-repository-branch-rename/kep.yaml

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

Signed-off-by: Carlos Panato <[email protected]>

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

xmudrii · 2022-02-09T10:33:22Z

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

+
+- https://github.com/github/renaming
+
+### Risks and Mitigations


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)?

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 :(

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 :)

will add this as a risk and mitigation plans

xmudrii · 2022-02-09T10:43:18Z

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

+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).


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.

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 <[email protected]>

justaugustus

@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

Signed-off-by: Carlos Panato <[email protected]>

cpanato · 2022-02-13T13:14:41Z

did the rename of the directory @justaugustus, PTAL

/hold cancel

justaugustus

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

k8s-ci-robot · 2022-02-14T11:22:59Z

[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:

~~keps/sig-release/OWNERS~~ [cpanato,justaugustus]

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

BenTheElder · 2022-07-26T08:32:09Z

keps/sig-release/2853-k-core-branch-rename/kep.yaml

+authors:
+  - "@cpanato"
+owning-sig: sig-release
+participating-sigs:


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

BenTheElder · 2022-07-26T08:35:27Z

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

+- 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


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.

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 requested review from jeremyrickard and puerco November 19, 2021 09:24

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

cpanato mentioned this pull request Nov 19, 2021

Changing default branch name to main kubernetes/kubernetes#105601

Open

18 tasks

saschagrunert reviewed Nov 19, 2021

View reviewed changes

BenTheElder reviewed Nov 19, 2021

View reviewed changes

keps/sig-release/2853-kubernetes-kubernetes-repository-branch-rename/kep.yaml Outdated Show resolved Hide resolved

cpanato requested a review from saschagrunert November 26, 2021 11:56

cpanato force-pushed the KEP-2853 branch 4 times, most recently from 6633a70 to 76a64b2 Compare November 26, 2021 12:35

sftim reviewed Dec 16, 2021

View reviewed changes

keps/sig-release/2853-kubernetes-kubernetes-repository-branch-rename/README.md Outdated Show resolved Hide resolved

sftim reviewed Dec 16, 2021

View reviewed changes

cpanato force-pushed the KEP-2853 branch from 76a64b2 to 6badf1f Compare December 23, 2021 10:12

cpanato mentioned this pull request Dec 23, 2021

add main branch for presubmit jobs and update some generate scripts kubernetes/test-infra#24734

Merged

cpanato force-pushed the KEP-2853 branch from 6badf1f to 4794345 Compare December 23, 2021 11:31

k8s-ci-robot assigned justaugustus and saschagrunert Jan 25, 2022

saschagrunert reviewed Jan 26, 2022

View reviewed changes

cpanato added 2 commits February 9, 2022 11:02

KEP-2853: Initial Draft of branch rename for k/k

f6a735f

Signed-off-by: Carlos Panato <[email protected]>

update based on feedback

53bfb98

Signed-off-by: Carlos Panato <[email protected]>

cpanato force-pushed the KEP-2853 branch 2 times, most recently from 47fd2ca to 859218f Compare February 9, 2022 10:18

xmudrii reviewed Feb 9, 2022

View reviewed changes

update based on feedback round 2

6898684

Signed-off-by: Carlos Panato <[email protected]>

cpanato force-pushed the KEP-2853 branch from 859218f to 6898684 Compare February 9, 2022 16:21

justaugustus approved these changes Feb 10, 2022

View reviewed changes

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

update based on feedback round 3

7be03bd

Signed-off-by: Carlos Panato <[email protected]>

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 13, 2022

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

justaugustus approved these changes Feb 14, 2022

View reviewed changes

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 merged commit 35bf13f into kubernetes:master Feb 14, 2022

k8s-ci-robot added this to the v1.24 milestone Feb 14, 2022

cpanato deleted the KEP-2853 branch February 14, 2022 12:05

cpanato changed the title ~~KEP-2853: Initial Draft of branch rename for k/k~~ KEP-2853: Branch rename for k/k Mar 15, 2022

BenTheElder reviewed Jul 26, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cpanato commented Nov 19, 2021

saschagrunert left a comment

justaugustus commented Jan 25, 2022

saschagrunert left a comment

xmudrii Feb 9, 2022

cpanato Feb 9, 2022

saschagrunert Feb 10, 2022

cpanato Feb 10, 2022

xmudrii Feb 9, 2022

cpanato Feb 9, 2022

justaugustus left a comment

cpanato commented Feb 13, 2022

justaugustus left a comment

k8s-ci-robot commented Feb 14, 2022

BenTheElder Jul 26, 2022

BenTheElder Jul 26, 2022


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

		### Risks and Mitigations

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

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

Conversation

cpanato commented Nov 19, 2021

saschagrunert left a comment

Choose a reason for hiding this comment

justaugustus commented Jan 25, 2022

saschagrunert left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

justaugustus left a comment

Choose a reason for hiding this comment

cpanato commented Feb 13, 2022

justaugustus left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Feb 14, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment