-
Notifications
You must be signed in to change notification settings - Fork 9.7k
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 cluster peer HTTP SRV discovery when no HTTPS records exist #11776
Conversation
7afcc2e
to
908b97c
Compare
Codecov Report
@@ Coverage Diff @@
## master #11776 +/- ##
==========================================
- Coverage 66.65% 66.36% -0.29%
==========================================
Files 403 403
Lines 36881 36881
==========================================
- Hits 24582 24477 -105
- Misses 10811 10906 +95
- Partials 1488 1498 +10
Continue to review full report at Codecov.
|
Thanks a lot for this fix @brandond . Can someone from the team please merge this change? Thanks in advance. |
Yeah, we also really need this PR merged so we can finally upgrade our cluster. |
Is there anything I can do to help move this forward? I realize pulling in multierr might be controversial, I'm open to alternate approaches to wrapping or combining the errors. |
@brandond have you been able to find a workaround in the meantime? Or did you endup just using your own fork? |
@trivigy yeah I'm just running off a local fork. |
a4c16f2
to
188a718
Compare
@gyuho could you (or another maintainer) maybe have a look? We finally want to upgrade. |
This issue has been automatically marked as stale because it has not had recent activity. It will be closed after 21 days if no further activity occurs. Thank you for your contributions. |
Not stale |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm sorry for not looking at this earlier. Thank you for the fix.
Could you, please:
- Rebase this
- Add a regression test for this scenario.
188a718
to
f61245d
Compare
Rebased and requested changes made. I'll take a look at how to best mock the SRV responses for a proper test. |
Thank you for the iteration.
|
@ptabor go.sum should be fixed now. I added some tests for both sections of the codebase that I touched; hopefully that looks good? I'm not sure how to get codecov to update. |
Thank you for fix. Hopefully last thing to update: There is inconsistency in go.mod's that break PASSES="fmt" ./test.sh
|
I have no idea where any of that is coming from, the only go.mod that references multierr is in server. I'm going to see if squashing my changes and then doing a clean set of go.mod changes fixes this. |
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
eb9dc88
to
603d975
Compare
Well I fixed that but now CodeQL appears to be failing due to some transient github error? |
Thank you ! |
embed: Fix cluster peer HTTP SRV discovery
Fixed issue where peer SRV discovery failed if no HTTPS endpoints were discovered. HTTP endpoints were never added to the address list due to a bad error check, and the
_etcd-server-ssl._tcp.<domain>
failure masked the subsequent success of lookups for_etcd-server._tcp.<domain>
Fixes #11321