-
Notifications
You must be signed in to change notification settings - Fork 455
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: Jenny Shu <[email protected]>
- Loading branch information
Showing
7 changed files
with
22 additions
and
173 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,22 @@ | ||
# Backports | ||
|
||
## What is a backport? | ||
A backport is a change that is introduced on the main branch, and then applied to a previous version of Gloo Gateway. | ||
A backport is a change that is introduced on the main branch, and then applied to a previous version of kgateway. | ||
|
||
## When is backporting appropriate? | ||
For a backport to be appropriate it must fit the following criteria: | ||
- The change must have a clear rationale for why it is needed on a previous version of Gloo Gateway. | ||
- The change must have a clear rationale for why it is needed on a previous version of kgateway. | ||
- The change must be a low-risk change, this typically means it is a bug fix or a non-breaking change. | ||
- The proposed change is targeted to a [supported, stable release branch](https://docs.solo.io/gloo-edge/latest/reference/support/). | ||
- If the change is a feature request, you must have explicit approval from the product and engineering teams. This approval can also be solicited on the backport prs themselves | ||
- Generally a backport for a feature should have been requested by at least one of these teams to be considered in the first place | ||
- Generally a backport for a feature should have a larger discussion in the community and may need to be brought up at a community meeting. | ||
|
||
## How to identify a backport | ||
On the issue that tracks the desired functionality, apply a `release/1.N` label to indicate the version of Gloo Gateway you wish the request to be supported on. | ||
On the issue that tracks the desired functionality, apply a `release/1.N` label to indicate the version of kgateway you wish the request to be supported on. | ||
|
||
For example, if there is a `release/1.15` label, that means the issue is targeted to be introduced first on the stable main branch, and then backported to Gloo Gateway 1.15.x. | ||
|
||
## How to create a backport | ||
First, create a PR to introduce the change on the main branch. Doing so ensures that changes are tested and reviewed before being applied to a previous version of Gloo Gateway. Also, given that we use [protocol buffers](https://developers.google.com/protocol-buffers) for our API definitions, introducing API changes to our main branch first ensures we will not have API compatibility issues when backporting. | ||
First, create a PR to introduce the change on the main branch. Doing so ensures that changes are tested and reviewed before being applied to a previous version of kgateway. | ||
|
||
Once the change has been merged into the main branch, create a PR to backport the change to the desired release branch. The PR should be titled `[BRANCH NAME]: <PR title>` (ie `[1.14]: Original PR Title`). To create a backport branch we recommend the following: | ||
- Use [cherry-pick](https://git-scm.com/docs/git-cherry-pick) to apply changes to a previous version of Gloo Gateway. | ||
- Resolve any conflicts that have arisen due to drift between LTS branches | ||
- If there is significant drift that causes the cherry-pick to be non-trivial, consider re-implementing the change from scratch rather than "backporting" | ||
- Modify the changelog to be in the proper directory | ||
- Validate that Proto fields have the same numbers as in main | ||
- Title your pr to start with the major.minor version that you are backporting to (e.g. 1.13 for 1.13.x branch) | ||
- Use [cherry-pick](https://git-scm.com/docs/git-cherry-pick) to apply changes to a previous version of kgateway. | ||
- Resolve any conflicts that have arisen due to drift. | ||
- If there is significant drift that causes the cherry-pick to be non-trivial, consider re-implementing the change from scratch rather than "backporting" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,3 @@ | ||
# Documentation | ||
|
||
The documentation is built from a private GitHub repository. Currently, only Solo.io team members can contribute to this repository. | ||
|
||
To request changes to the documentation or report a problem, follow the steps to [file an issue](/devel/contributing/issues.md) | ||
|
||
## Auto-generated Docs | ||
Please note that some of our documentation is auto-generated from source code. This includes: | ||
- [Proto API Reference](https://docs.solo.io/gloo-edge/latest/reference/api/) | ||
- [Helm Values](https://docs.solo.io/gloo-edge/latest/reference/helm_chart_values/) | ||
// TODO(nfuden): link to docs pipeline setups |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,17 @@ | ||
# Filing Issues | ||
|
||
GitHub issues are the main way for reporting bugs and requesting features in Gloo Gateway. | ||
GitHub issues are the main way for reporting bugs, tracking work you want to do and requesting features in kgateway. | ||
|
||
If you encounter a bug or have a feature request, please take the following approach: | ||
1. Search for existing issues. | ||
2. If you find a similar issue, add a comment with additional information or add a 👍 reaction to indicate your agreement. | ||
3. If there are no similar issues, [file a new one](https://github.com/solo-io/gloo/issues/new/choose) | ||
3. If there are no similar issues, [file a new one](https://github.com/kgateway-dev/kgateway/issues/new/choose) | ||
|
||
**Issues in this repo should not contain any sensitive information. If sensitive information is critical to the issue, please reach out to Solo.io support to open a ticket.** | ||
**Issues in this repo should not contain any sensitive information. If sensitive information is critical to the issue, please submit via the security pipeline https://github.com/kgateway-dev/community/blob/main/CVE.md.** | ||
|
||
## Bug Report | ||
- Issues can include links to private resources, such as Slack conversations or private code. | ||
- Private Enterprise issues can be used to track Open Source work. | ||
- The more details about the issue, the better. Please include the following information: | ||
- Gloo Gateway version | ||
- Kgateway version | ||
- Kubernetes version | ||
- Operating system | ||
- Steps to reproduce | ||
|
@@ -32,7 +30,5 @@ If you encounter a bug or have a feature request, please take the following appr | |
- Copy the error message from the failed job (logs are discarded after a few months). | ||
|
||
## Security Issues | ||
We take Gloo Gateway's security very seriously. If you've found a security issue or a potential security issue in Gloo Gateway, please **DO NOT** file a public Github issue. | ||
|
||
*Instead, send your report privately to [email protected]* | ||
We take kgateway's security very seriously. If you've found a security issue or a potential security issue in kgateway, please **DO NOT** file a public Github issue, instead see https://github.com/kgateway-dev/community/blob/main/CVE.md for how to submit. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters