Skip to content

📖 Versioning and Branching Strategy #216

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

Merged

Conversation

DirectXMan12
Copy link
Contributor

This is mostly a proposal at this point. I've started to outline the branch strategy we've loosely discussed in the past, with some motivations and discussion of alternatives.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 16, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DirectXMan12

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 requested a review from droot November 16, 2018 23:54
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 16, 2018
@DirectXMan12
Copy link
Contributor Author

@droot @pwittrock PTAL and let me know what you think


### Breaking Changes

Try to avoid breaking changes. They make life difficult for users, who
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we provide a sed operation to automatically fix any breaking changes with defaults that maintain the old behavior or provide some new default?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Probably want more intelligent than sed, but it should be possible to do so

@droot droot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 21, 2018
This adds in documentation on versioning, branching, and maintenance.
There's still a couple of places where we have to create scripts and
fill in process, but this lays the initial groundwork.
@DirectXMan12 DirectXMan12 force-pushed the docs/branching-strategy branch from 657d0aa to 64a9833 Compare November 26, 2018 22:20
@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 26, 2018
@DirectXMan12 DirectXMan12 changed the title [WIP] 📖 Versioning and Branching Strategy 📖 Versioning and Branching Strategy Nov 26, 2018
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 26, 2018

### Mantainers

Don't be lazy, read the rest of this doc :-)
Copy link
Contributor

Choose a reason for hiding this comment

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

:)

### Contributors

- All code PR must be labeled with :bug: (patch fixes), :sparkles:
(backwards-compatible features), or :warning: (breaking changes)
Copy link
Contributor

Choose a reason for hiding this comment

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

Github PR template can help us here.

@droot droot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 26, 2018
@k8s-ci-robot k8s-ci-robot merged commit 8991a78 into kubernetes-sigs:master Nov 26, 2018
justinsb pushed a commit to justinsb/controller-runtime that referenced this pull request Dec 7, 2018
…ng-strategy

📖 Versioning and Branching Strategy
@DirectXMan12 DirectXMan12 deleted the docs/branching-strategy branch January 31, 2020 23:58
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants