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

server/etcdmain: add configurable cipher list to gRPC proxy listener #14308

Merged
merged 3 commits into from
Sep 16, 2022

Conversation

dusk125
Copy link
Contributor

@dusk125 dusk125 commented Aug 3, 2022

This PR essentially reopens #13362 cherrypicked onto main and with the requested test.

@tjungblu
Copy link
Contributor

tjungblu commented Aug 4, 2022

hah now I can 👮 you have to commit -s and sign the commit

tests/e2e/etcd_config_test.go Outdated Show resolved Hide resolved
tests/e2e/etcd_config_test.go Outdated Show resolved Hide resolved
tests/e2e/etcd_config_test.go Outdated Show resolved Hide resolved
tests/e2e/etcd_config_test.go Outdated Show resolved Hide resolved
@ahrtr
Copy link
Member

ahrtr commented Aug 15, 2022

Please fix the format error, try to run gofmt -w the_file_you_changed

@ahrtr
Copy link
Member

ahrtr commented Aug 15, 2022

Please also add an item into the changelog-3.6

CHANGELOG/CHANGELOG-3.6.md Outdated Show resolved Hide resolved
Co-authored-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Allen Ray <alray@redhat.com>
@codecov-commenter
Copy link

Codecov Report

Merging #14308 (959ef20) into main (f56e0d0) will decrease coverage by 0.12%.
The diff coverage is 50.00%.

@@            Coverage Diff             @@
##             main   #14308      +/-   ##
==========================================
- Coverage   75.34%   75.22%   -0.13%     
==========================================
  Files         457      457              
  Lines       37185    37197      +12     
==========================================
- Hits        28016    27980      -36     
- Misses       7405     7447      +42     
- Partials     1764     1770       +6     
Flag Coverage Δ
all 75.22% <50.00%> (-0.13%) ⬇️

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

Impacted Files Coverage Δ
server/embed/config.go 73.96% <0.00%> (+0.56%) ⬆️
server/etcdmain/grpc_proxy.go 61.90% <60.00%> (-0.83%) ⬇️
client/pkg/v3/tlsutil/cipher_suites.go 62.50% <0.00%> (-37.50%) ⬇️
server/lease/lease.go 94.87% <0.00%> (-5.13%) ⬇️
client/v3/leasing/cache.go 87.77% <0.00%> (-3.89%) ⬇️
client/pkg/v3/testutil/recorder.go 76.27% <0.00%> (-3.39%) ⬇️
server/etcdserver/api/v3rpc/member.go 93.54% <0.00%> (-3.23%) ⬇️
pkg/adt/interval_tree.go 84.71% <0.00%> (-2.51%) ⬇️
client/v3/leasing/kv.go 89.03% <0.00%> (-2.33%) ⬇️
server/etcdserver/api/v3rpc/interceptor.go 75.52% <0.00%> (-2.09%) ⬇️
... and 14 more

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

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

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.

lgtm, these changes were long awaited. Thanks @dusk125

@spzala spzala merged commit cdf4228 into etcd-io:main Sep 16, 2022
@tjungblu
Copy link
Contributor

@dusk125 I think we also need this in 3.5 and 3.4 respectively since the report dates back into openshift 4.8

@ahrtr ahrtr mentioned this pull request Oct 19, 2022
dusk125 pushed a commit to dusk125/etcd that referenced this pull request Nov 1, 2022
server/etcdmain: add configurable cipher list to gRPC proxy listener
dusk125 pushed a commit to dusk125/etcd that referenced this pull request Nov 2, 2022
server/etcdmain: add configurable cipher list to gRPC proxy listener
dusk125 pushed a commit to dusk125/etcd that referenced this pull request Nov 2, 2022
server/etcdmain: add configurable cipher list to gRPC proxy listener
dusk125 pushed a commit to dusk125/etcd that referenced this pull request Nov 2, 2022
server/etcdmain: add configurable cipher list to gRPC proxy listener
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.

6 participants