Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Action Required] Ensure 2.11 branch readiness for 2.11.1 release #3650

Closed
1 of 2 tasks
Tracked by #4199
gaiksaya opened this issue Nov 4, 2023 · 3 comments
Closed
1 of 2 tasks
Tracked by #4199

[Action Required] Ensure 2.11 branch readiness for 2.11.1 release #3650

gaiksaya opened this issue Nov 4, 2023 · 3 comments
Labels
triaged Issues labeled as 'Triaged' have been reviewed and are deemed actionable. v2.11.1 Issues targeting release v2.11.1

Comments

@gaiksaya
Copy link
Member

gaiksaya commented Nov 4, 2023 •
edited by bbarani
Loading

Coming from opensearch-project/opensearch-build#4161

What is happening?

We are planning 2.11.1 release in upcoming few weeks. Following the semver guildelines and branching strategy, this release will be based on 2.11 as a reference branch

Why?

  1. We need this release because of a critical breaking bug in the security plug-in. This bug impacts everyone using logstash and the only work around is to turn off compression (which is expensive)

  2. As a refresher, our normal process is to commit changes to main, then backport to 2.x. Since the 1.0 release, we only backport bug fixes and security changes to the current 2.x branch (in this case 2.11) so that if we need to we can quickly do a patch release.

  3. There are two reason we don’t back port features to the current release branch (right now 2.11):

    1. Because we want patch release to be as thin as possible, and the more changes you make, the more verification we need to do
    2. Adding features in a patch breaks semver.

However, looking at the list of changes for 2.11, we currently have a mix of features that have been merged in. After providing several options and discussing with all the component teams as well as community we came to the conclusion of reverting all feature related changes from 2.11 branch.

What do I need to do?

Please help revert all the commits that are related to new features or enhancements from 2.11 branch that were added after 2.11.0 release.
Here is a rough list of commits that went in after 2.11.0 release for each repo.

Status

Please check-mark one of the below and close this issue once the action item is completed.

  • We confirm that no features or enhancements were added to 2.11 branch. We are good to go for 2.11.1 consisting only of bug fixes and security fixes.

OR

  • We have reverted all the feature or ehancement related commits from 2.11 branch. We are good to go for 2.11.1 consisting only of bug fixes and security fixes.

Thank you!
cc: @bbarani @CEHENKLE @Divyaasm
@gaiksaya gaiksaya added the v2.11.1 Issues targeting release v2.11.1 label Nov 4, 2023
@github-actions github-actions bot added the untriaged Require the attention of the repository maintainers and may need to be prioritized label Nov 4, 2023
@stephen-crawford
Copy link
Contributor

[Triage] This issue is for the 2.11.1 release. We will want to make sure we don't have any unintended changes etc.

@stephen-crawford stephen-crawford added triaged Issues labeled as 'Triaged' have been reviewed and are deemed actionable. and removed untriaged Require the attention of the repository maintainers and may need to be prioritized labels Nov 6, 2023
@gaiksaya gaiksaya mentioned this issue Nov 6, 2023
Closed
36 tasks
@cwperks cwperks mentioned this issue Nov 6, 2023
Merged
3 tasks
RyanL1997 pushed a commit that referenced this issue Nov 7, 2023
@cwperks
[2.11] Revert PRs added to 2.11 that are not part of 2.11.1 release (#…
1d46ba6 
…3661)

### Description

Reverts 2 PRs added after the 2.11.0 release that should not be in the
2.11.1 release:

- #3486
- #3480

### Issues Resolved

#3650

### Check List
- [ ] New functionality includes testing
- [ ] New functionality has been documented
- [ ] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and
signing off your commits, please check
[here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).
@RyanL1997
Copy link
Collaborator

closing this on behalf of the merge of #3661

@peternied
Copy link
Member

👎 This pull request [1] doesn't make sense to me . Reverting missing license headers and improvements to CI should be valid our teams standards for patch releases. They aren't part of the semver conversation - this is throwing the baby out with the bathwater.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
triaged Issues labeled as 'Triaged' have been reviewed and are deemed actionable. v2.11.1 Issues targeting release v2.11.1
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@peternied @gaiksaya @stephen-crawford @RyanL1997