RFC: Change default kudobuilder org branches to main

[gerred]

Github is working on making this change as a default. Some more context here from the person who picked the names:

https://twitter.com/devgerred/status/1272345655864893445

This is more of a RFC than a proposal. Pending any disastrous reason we can't make this change immediately, I will be changing the default in Github and pushing up the main branch in 24 hours.

Please remember to abide by our Code of Conduct.

[kensipe]

sounds good to me!

[kensipe]

don't see any issues... however we will need to change over / review CI and scripts

[kensipe]

also for the record :) "main" is an easy switch... it is just as good a branch as any other... but "origin" is baked into git and I already heavily use "upstream" for the forked upstream project and would struggle with any change there.

[gerred]

Oh yeah, I'm ignoring upstream - I just thought that part was interesting. :)

[gerred]

And would be entirely local to your environment.

[kensipe]

For organizational purposes.... I propose:

1. create "main" from "master" and do NOT delete master
2. master branch will have a deprecation time limit (2 weeks or until all dependent PRs are merged or retargeted which ever is sooner)
3. All PRs passed deadline will have to be targeted
4. Upon deadline or all PRs merged (which ever is sooner) we delete master
5. Once "main" is created, all new PRs need to be against "main" cc: @gerred

[kensipe]

I think the debate if any will be on the length of time of deprecation... but open to any

[mattj-io]

Huge +1 from me on this change. Also agree with everything Ken said - I think 2 weeks is a fair time limit if you want your PR merged.

[kensipe]

required code changes for kuttl move: https://github.com/kudobuilder/kuttl/pull/138

[gerred]

I noticed a few other projects are using trunk - I don't care either way but wanted to put that forward as well @kensipe.

[gerred]

@nat not that it's a huge change either way, but is there any guidance so far on what that default branch GH is switching to might be?

[mattj-io]

Goes without saying I am sure, but if GitHub are going to change, we should definitely align with them

[kensipe]

git alias when creating a new repo... instead of git init, with alias use git new

git config --global alias.new '!git init && git symbolic-ref HEAD refs/heads/main'

[zmalik]

SGTM!

For organizational purposes.... I propose:

create "main" from "master" and do NOT delete master master branch will have a deprecation time limit (2 weeks or until all dependent PRs are merged or retargeted which ever is sooner) All PRs passed deadline will have to be targeted

@kensipe if you change the default branch of the repo, all open PRs will be automatically targeting the new default branch. Changed to dev branch here https://github.com/mesosphere/kubeaddons-enterprise/pulls here and had no issues not sure if KUDO repos will have some special needs

[kensipe]

KUTTL is moved to main for HEAD of dev... additionally all PRs have been retargeted to main... which means that master can be deleted.

[kensipe]

The closing of https://github.com/kudobuilder/kuttl/pull/138 closed this issue... however this issue is not complete... reopening

[ANeumann82]

@kensipe Isn't this done by now? I think we can close it, right?