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.

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

Update 3.4, 3.5, and 3.6 changelogs for adding configurable cipher list to gRPC proxy #14524

Merged
merged 1 commit into from
Oct 28, 2022

Conversation

dusk125
Copy link
Contributor

@dusk125 dusk125 commented Sep 26, 2022

Since I'm backporting #14308 from 3.6 to 3.5, I need to move the changelog line to 3.5

CHANGELOG/CHANGELOG-3.5.md Outdated Show resolved Hide resolved
@ahrtr ahrtr changed the title Move grpc-proxy item from 3.6 to 3.5 changelog Update 3.4 and 3.5 changelog for adding configurable cipher list to gRPC proxy Sep 26, 2022
@ahrtr
Copy link
Member

ahrtr commented Sep 26, 2022

Please also update the changelog-3.4 after you backport the fix to 3.4.

@codecov-commenter
Copy link

codecov-commenter commented Sep 29, 2022

Codecov Report

Merging #14524 (514c8b2) into main (ac1b076) will increase coverage by 0.00%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main   #14524   +/-   ##
=======================================
  Coverage   75.50%   75.50%           
=======================================
  Files         457      457           
  Lines       37276    37276           
=======================================
+ Hits        28146    28147    +1     
+ Misses       7362     7354    -8     
- Partials     1768     1775    +7     
Flag Coverage Δ
all 75.50% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
client/v3/concurrency/session.go 88.63% <0.00%> (-4.55%) ⬇️
server/etcdserver/txn/util.go 75.47% <0.00%> (-3.78%) ⬇️
api/etcdserverpb/raft_internal_stringer.go 81.72% <0.00%> (-2.16%) ⬇️
server/etcdserver/api/rafthttp/peer.go 85.06% <0.00%> (-1.95%) ⬇️
pkg/adt/interval_tree.go 85.96% <0.00%> (-1.26%) ⬇️
client/v3/maintenance.go 59.37% <0.00%> (-1.25%) ⬇️
server/proxy/grpcproxy/watch.go 92.48% <0.00%> (-1.16%) ⬇️
server/etcdserver/api/v3rpc/interceptor.go 73.43% <0.00%> (-1.05%) ⬇️
client/v3/client.go 81.38% <0.00%> (-0.95%) ⬇️
client/v3/leasing/kv.go 89.70% <0.00%> (-0.67%) ⬇️
... and 10 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Member

@spzala spzala left a comment

Choose a reason for hiding this comment

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

@dusk125 thanks but why are removing the entry from the 3.6 changelog? I think you just need to update the 3.5 changelog. Also, I think you may not need a separate PR (this PR) for changelog as the PR #14500 is still open and you can modify the changelog there to keep it clean (something you did in the #14308). Thanks!

@ahrtr
Copy link
Member

ahrtr commented Oct 3, 2022

@spzala Please refer to #14476 (comment) to get the reason of why removing the changelog item from 3.6. Please also kindly share your thoughts. Probably we should clearly document the rules in CHANGELOG/README.md if you agree.

Copy link
Member

@spzala spzala left a comment

Choose a reason for hiding this comment

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

Please fix merge conflict. Thanks @dusk125

@spzala
Copy link
Member

spzala commented Oct 5, 2022

@spzala Please refer to #14476 (comment) to get the reason of why removing the changelog item from 3.6. Please also kindly share your thoughts. Probably we should clearly document the rules in CHANGELOG/README.md if you agree.

@ahrtr thanks and I see, I am fine with the PR changes in that case. And, yes, we definitely should update the changelog README. I think we need some more discussions, and we can discuss it more cleanly in a PR for README update. Hope that makes sense.

@ahrtr
Copy link
Member

ahrtr commented Oct 5, 2022

@spzala Please refer to #14476 (comment) to get the reason of why removing the changelog item from 3.6. Please also kindly share your thoughts. Probably we should clearly document the rules in CHANGELOG/README.md if you agree.

@ahrtr thanks and I see, I am fine with the PR changes in that case. And, yes, we definitely should update the changelog README. I think we need some more discussions, and we can discuss it more cleanly in a PR for README update. Hope that makes sense.

Makes sense to me. Please feel free to deliver a PR for this or Please let me know if you want me to deliver a PR.

@ahrtr
Copy link
Member

ahrtr commented Oct 15, 2022

Thanks both @dusk125 and @spzala

There is a discussion recently related to the rules of adding changelog items. FYI. #14570 (comment) . Based on the discussion, the main changelog gives one place to see what's changed over previous minor or major release, so we should add the changelog item for 3.6 back.

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

Please add an item for 3.4 and add the item for 3.6 back.

@ahrtr
Copy link
Member

ahrtr commented Oct 27, 2022

@dusk125 Please update this PR per the comment above so that we can merge it.

@dusk125 dusk125 force-pushed the update-changelog branch 2 times, most recently from d091e1c to 8c328ae Compare October 27, 2022 18:46
@dusk125 dusk125 changed the title Update 3.4 and 3.5 changelog for adding configurable cipher list to gRPC proxy Update 3.4, 3.5, and 3.6 changelogs for adding configurable cipher list to gRPC proxy Oct 27, 2022
@ahrtr
Copy link
Member

ahrtr commented Oct 27, 2022

Please rebase this PR and add the changelog item for 3.6 back (FYI. #14524 (comment) )

Signed-off-by: Allen Ray <alray@redhat.com>
@dusk125
Copy link
Contributor Author

dusk125 commented Oct 28, 2022

Please rebase this PR and add the changelog item for 3.6 back (FYI. #14524 (comment) )

This PR was the one that removed the 3.6 changelog entry; since it didn't get merged before the change was backported to 3.4, the 3.6 changelog entry is still there and hasn't been removed.

@ahrtr
Copy link
Member

ahrtr commented Oct 28, 2022

Please rebase this PR and add the changelog item for 3.6 back (FYI. #14524 (comment) )

This PR was the one that removed the 3.6 changelog entry; since it didn't get merged before the change was backported to 3.4, the 3.6 changelog entry is still there and hasn't been removed.

Thanks for the clarification.

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

LGTM

Thank you @dusk125

@ahrtr ahrtr merged commit de6b4b9 into etcd-io:main Oct 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants