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

fix: Allow gRPC connections from gRPC versions >1.17.x #6577

Merged
merged 2 commits into from
Jun 28, 2021

Conversation

jannfis
Copy link
Member

@jannfis jannfis commented Jun 27, 2021

gRPC has changed handshake processing from v1.17 upwards, in a way that's incompatible with default cmux processing (see grpc/grpc-go#2406 and https://github.com/soheilhy/cmux#limitations).

This fix lets gRPC clients >1.17 do a handshake with Argo CD gRPC server.

Fixes #6525

Signed-off-by: jannfis jann@mistrust.net

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

Signed-off-by: jannfis <jann@mistrust.net>
Signed-off-by: jannfis <jann@mistrust.net>
@codecov
Copy link

codecov bot commented Jun 27, 2021

Codecov Report

Merging #6577 (173b63a) into master (f74d807) will decrease coverage by 0.01%.
The diff coverage is 50.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6577      +/-   ##
==========================================
- Coverage   41.26%   41.25%   -0.02%     
==========================================
  Files         156      156              
  Lines       20673    20675       +2     
==========================================
- Hits         8531     8529       -2     
- Misses      10935    10938       +3     
- Partials     1207     1208       +1     
Impacted Files Coverage Δ
server/server.go 54.95% <50.00%> (ø)
server/rbacpolicy/rbacpolicy.go 79.03% <0.00%> (-4.31%) ⬇️
server/application/logs.go 84.48% <0.00%> (-1.24%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f74d807...173b63a. Read the comment docs.

@jannfis jannfis requested review from alexmt and jessesuen June 27, 2021 07:47
Copy link
Member

@jessesuen jessesuen left a comment

Choose a reason for hiding this comment

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

Great catch!

@jannfis jannfis self-assigned this Jun 28, 2021
@jannfis jannfis merged commit d47f466 into argoproj:master Jun 28, 2021
@jannfis jannfis added the needs-verification PR requires pre-release verification label Jul 2, 2021
@alexmt alexmt removed the needs-verification PR requires pre-release verification label Aug 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can not use google.golang.org/grpc other than v1.15.0
3 participants