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

Add support for enabling connect-based ingress TLS per listener. #11163

Merged
merged 4 commits into from
Oct 25, 2021

Conversation

banks
Copy link
Member

@banks banks commented Sep 28, 2021

This adds support for a case I missed in #10903.

This is technically new functionality not directly related to SDS so I'll add a separate changelog entry but with the addition of nested TLS blocks in more places it makes sense for the fields there to actually function in a reasonable way.

This behaviour was proposed in the RFC. It adds the ability to use the built-in Connect TLS for only a subset of Ingress listeners which might be useful to some people but mostly is to avoid confusing disparity between built-in TLS being all or nothing while SDS is more fine-grained.

@github-actions github-actions bot added the theme/envoy/xds Related to Envoy support label Sep 28, 2021

return &mergedCfg, nil
}

Copy link
Member Author

Choose a reason for hiding this comment

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

This is just a straight move from the ingress file - I missed this ingress-specific function when refactoring into a separate file in the last PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

Not Quite true anymore - I refactored out the extra lookup since the caller already has listenerCfg per RB's suggestion. But other than that one minor change this is not new code just moved from the other file!

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 28, 2021 12:43 Inactive
@vercel vercel bot temporarily deployed to Preview – consul September 28, 2021 12:43 Inactive
@banks banks added this to the 1.11.0 milestone Sep 28, 2021
@banks banks requested a review from a team as a code owner September 28, 2021 16:12
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 28, 2021 16:12 Inactive
@vercel vercel bot temporarily deployed to Preview – consul September 28, 2021 16:12 Inactive
@vercel vercel bot temporarily deployed to Preview – consul September 28, 2021 16:13 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 28, 2021 16:13 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging October 8, 2021 11:33 Inactive
@vercel vercel bot temporarily deployed to Preview – consul October 8, 2021 11:33 Inactive
@banks
Copy link
Member Author

banks commented Oct 8, 2021

@rboyer thanks for taking a look! I made the refactor you suggested let me know if there's anything else you can see blocking a merge!

@banks banks requested a review from rboyer October 8, 2021 11:41
@@ -0,0 +1,120 @@
{
Copy link
Member

Choose a reason for hiding this comment

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

You should probably rebase and make envoy-regen since @eculver did an envoy version upgrade since you branched..

Copy link
Member

@rboyer rboyer left a comment

Choose a reason for hiding this comment

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

LGTM but needs a rebase

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging October 19, 2021 20:38 Inactive
@vercel vercel bot temporarily deployed to Preview – consul October 19, 2021 20:38 Inactive
@banks banks merged commit 954b283 into main Oct 25, 2021
@banks banks deleted the feature/ingress-tls-mixed branch October 25, 2021 20:36
@hc-github-team-consul-core
Copy link
Collaborator

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/484178.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/envoy/xds Related to Envoy support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants