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

Backport of fix: add tls config to unix socket when https is used into release/1.13.x #16334

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #16301 to be assessed for backporting due to the inclusion of the label backport/1.13.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

Add tls config to unix socket when https is used

Testing & Reproduction steps

Manually tested with the following agent config

"addresses": {
        "grpc_tls" : "unix://consul/consul_grpc.sock",
        "http" : "unix://consul/consul_http.sock",
        "https" : "unix://consul/consul_https.sock"
    },
export CONSUL_HTTP_ADDR=unix://consul/consul_https.sock
CONSUL_HTTP_SSL=true consul connect 

Links

fix #16252

PR Checklist

  • updated test coverage
  • external facing docs updated
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/gh-16525-fix-http-unix-socket/heartily-poetic-racer branch from 289ed16 to 5b46af6 Compare February 21, 2023 13:28
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/gh-16525-fix-http-unix-socket/heartily-poetic-racer branch from 5b46af6 to 289ed16 Compare February 21, 2023 13:28
Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@huikang huikang marked this pull request as ready for review February 21, 2023 15:33
@huikang huikang merged commit 4a53d70 into release/1.13.x Feb 21, 2023
@huikang huikang deleted the backport/gh-16525-fix-http-unix-socket/heartily-poetic-racer branch February 21, 2023 15:58
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