Document PR #85968 (Fix bug in apiserver service cidr split)

contributing-to-kubernetes / gnosis

gnosis: signifying knowing through observation or experience

22 stars 6 forks source link

Document PR #85968 (Fix bug in apiserver service cidr split) #19

Closed MorrisLaw closed 4 years ago

MorrisLaw commented 4 years ago

PR: https://github.com/kubernetes/kubernetes/pull/85968

ISSUE: bug

SIG LABELS: sig/api-machinery sig/network

alejandrox1 commented 4 years ago

@MorrisLaw i just created the bracnh issue-19 on this repo for us to work on this :smile:

alejandrox1 commented 4 years ago

Please feel free to push commits to that branch and then later on we can clean the history before we merge it to master. wdyt?

alejandrox1 commented 4 years ago

Im gonna "squash and merge" my PRs in order to avoid any "merged" commit messages on that branch. Should make it easier to then clean up whenever we want to merge to master.

alejandrox1 commented 4 years ago

Summary of what I just did, please criticize and suggest alternatives For every issue we propose we create a branch issue-X on this repo (upstream repo).

Then, while we work on the issue (the draft), we make PRs against the issue-X branch for the specific issue. When you are done working on your PR (it may take multiple PRs from us to get the issue-X branch ready to merge to master) you merge it as squash and merge (to avoid any merge commit messges).

When issue-X branch is ready to be merged into master we can then cleanup and merge it by making a PR from issue-X to master. After that, we share the work and look for feedback :rocket:

MorrisLaw commented 4 years ago

Yeah I think this is a good idea! Thank you @alejandrox1!

So... just to summarize:

Create a branch, named issue-X, on the upstream repo
Make iterative changes to the branch by making PRs against that branch
- When a PR is done being reviewed and worked on, merge it as squash and merge into the issue-X branch (to avoid any merge commit messages)
Once issue-X is ready to be merged, clean it up and merge the final result into master

alejandrox1 commented 4 years ago

Yas (we may want to commit these instructions in the repo as well, after we try them out to see if they make sense)

lol nvm.. just saw your pr

alejandrox1 commented 4 years ago

@MorrisLaw I pushed what i think is a final draft for this issue in a recent PR, please review at your convenience. Then we can see if its good to go to be published"