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.

Sign up for GitHub

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

Jump to bottom

feat(core): tls protocol upstream support upstream tls config #9947

Merged
merged 2 commits into from
Jan 16, 2023
Merged

feat(core): tls protocol upstream support upstream tls config #9947

merged 2 commits into from
Jan 16, 2023

Conversation

oowl
Copy link
Member

@oowl oowl commented Dec 13, 2022 •
edited by hbagdi
Loading

Summary

  1. tls protocol upstream support upstream tls config
  2. add stream upstream tls function pdk API

FTI-1479

TODO:

  • Add documentation PR

@oowl oowl force-pushed the feat-stream-upstream-tls branch from 2af5bcd to 799d6fc Compare December 13, 2022 05:54
@oowl
Copy link
Member Author

oowl commented Dec 13, 2022

because rebase brunch is too hard, so recreate this pr for #9754

@flrgh flrgh force-pushed the feat-stream-upstream-tls branch from f69a682 to 7e06d95 Compare December 13, 2022 17:47
flrgh
flrgh reviewed Dec 13, 2022
View reviewed changes
kong/pdk/service.lua Outdated Show resolved Hide resolved
flrgh
flrgh reviewed Dec 13, 2022
View reviewed changes
kong/runloop/handler.lua Outdated Show resolved Hide resolved
flrgh
flrgh requested changes Dec 13, 2022
View reviewed changes
Copy link
Contributor

@flrgh flrgh left a comment

Choose a reason for hiding this comment

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

Great work! Code looks good, and thanks for adding the integration+PDK tests. Here's what I think is left to do:

  • some minor corrections are needed (added suggestions inline)
  • a couple test cases for the service entity should be updated
  • see my comment re: de-duplicating the integration tests

And of course, we will also need to hold until your kong-build-tools PR is merged and release so that the dependency can be updated in .requirements.

@oowl
Copy link
Member Author

oowl commented Dec 15, 2022

@flrgh would you help me review child PR for this? Thanks. Kong/lua-kong-nginx-module#50

@oowl oowl force-pushed the feat-stream-upstream-tls branch from 6dd45b4 to 4acaf4c Compare December 15, 2022 15:15
@oowl oowl requested a review from flrgh December 15, 2022 15:42
@oowl oowl force-pushed the feat-stream-upstream-tls branch from 4acaf4c to 9c48cf4 Compare December 20, 2022 06:37
@oowl oowl force-pushed the feat-stream-upstream-tls branch from 9c48cf4 to 4ca80c9 Compare December 22, 2022 07:30
@fffonion fffonion mentioned this pull request Jan 3, 2023
Merged
@oowl oowl added this to the 3.2 milestone Jan 11, 2023
@oowl oowl force-pushed the feat-stream-upstream-tls branch from 84762f7 to d447c37 Compare January 11, 2023 14:47
@oowl oowl requested a review from fffonion January 13, 2023 09:20
@chronolaw chronolaw changed the title feat(core) tls protocol upstream support upstream tls config feat(core): tls protocol upstream support upstream tls config Jan 13, 2023
flrgh
flrgh reviewed Jan 13, 2023
View reviewed changes
kong/pdk/service.lua

local res, err = set_upstream_cert_and_key(chain, key)
return res, err
local tls = require("resty.kong.tls")
Copy link
Contributor

Choose a reason for hiding this comment

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

There's nothing better than the feeling of getting to de-indent a whole bunch of lines :D

flrgh
flrgh approved these changes Jan 13, 2023
View reviewed changes
Copy link
Contributor

@flrgh flrgh left a comment

Choose a reason for hiding this comment

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

Code-wise, looking good! 👍

Needs a changelog entry, so approving on the condition that one is added before merging (or at very least before the ticket is closed out).

@oowl oowl requested a review from catbro666 January 14, 2023 16:20
@oowl oowl force-pushed the feat-stream-upstream-tls branch from 15f9325 to e713c8d Compare January 15, 2023 17:42
@fffonion
Copy link
Contributor

please make sure docs is updated

@oowl oowl force-pushed the feat-stream-upstream-tls branch from e713c8d to 323840c Compare January 16, 2023 08:33
@fffonion fffonion merged commit 4930882 into master Jan 16, 2023
@fffonion fffonion deleted the feat-stream-upstream-tls branch January 16, 2023 08:58
@oowl oowl mentioned this pull request Jan 30, 2023
Merged
curiositycasualty pushed a commit that referenced this pull request Oct 15, 2024
@jschmid1 @brentos @samugi
feat(plugins): add new confluent plugin (#9947)
45ee373 
* feat(plugins): add new confluent plugin

---------

Co-authored-by: Brent Yarger <[email protected]>
Co-authored-by: samugi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flrgh flrgh flrgh approved these changes

@fffonion fffonion Awaiting requested review from fffonion

@catbro666 catbro666 Awaiting requested review from catbro666

Assignees
No one assigned
Labels
changelog core/balancer core/db core/pdk core/proxy core/templates schema-change-noteworthy size/XL
Projects
None yet
Milestone
3.2
Development

Successfully merging this pull request may close these issues.
4 participants
@oowl @fffonion @flrgh @catbro666