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(kuma-cp): use sni to verify upstream certificate san when specified along with address (backport #5347) #5378

Merged
merged 3 commits into from
Nov 29, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2022

This is an automatic backport of pull request #5347 done by Mergify.
Cherry-pick of 022180f has failed:

On branch mergify/bp/release-2.0/pr-5347
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit 022180fdc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/xds/envoy/clusters/v3/client_side_tls_configurer_test.go
	both modified:   pkg/xds/envoy/tls/v3/tls.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ed instead of address (#5347)

use sni to verify upstream certificate san when specified instead of address

Signed-off-by: James D Bloom <[email protected]>

Signed-off-by: James D Bloom <[email protected]>
Co-authored-by: Charly Molter <[email protected]>
@michaelbeaumont michaelbeaumont force-pushed the mergify/bp/release-2.0/pr-5347 branch 2 times, most recently from ba98c6d to 0c15c55 Compare November 29, 2022 13:56
@michaelbeaumont michaelbeaumont changed the title fix(kuma-cp): use sni to verify upstream certificate san when specified instead of address (backport #5347) fix(kuma-cp): use sni to verify upstream certificate san when specified along with address (backport #5347) Nov 29, 2022
@mergify mergify bot merged commit 7485065 into release-2.0 Nov 29, 2022
@mergify mergify bot deleted the mergify/bp/release-2.0/pr-5347 branch November 29, 2022 15:38
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.

3 participants