feat: support sni based tls route #1051

mangoGoForward · 2022-05-27T09:24:31Z

Signed-off-by: mango xu.weiKyrie@foxmail.com

Type of change:

Bugfix
New feature provided
Improve performance
Backport patches

What this PR does / why we need it:

Please see #547

Pre-submission checklist:

Did you explain what problem does this PR solve? Or what new features have been added?
Have you added corresponding test cases?
Have you modified the corresponding document?
Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

codecov-commenter · 2022-05-27T09:28:04Z

Codecov Report

Merging #1051 (dd48936) into master (e51a2c7) will increase coverage by 0.80%.
The diff coverage is 66.66%.

@@            Coverage Diff             @@
##           master    #1051      +/-   ##
==========================================
+ Coverage   40.62%   41.42%   +0.80%     
==========================================
  Files          75       82       +7     
  Lines        7006     7234     +228     
==========================================
+ Hits         2846     2997     +151     
- Misses       3847     3891      +44     
- Partials      313      346      +33

Impacted Files	Coverage Δ
pkg/providers/apisix/translation/apisix_route.go	`31.42% <50.00%> (+12.28%)`	⬆️
pkg/apisix/stream_route.go	`36.42% <100.00%> (ø)`
...kg/providers/apisix/translation/apisix_upstream.go	`55.26% <0.00%> (-44.74%)`	⬇️
pkg/apisix/resource.go	`56.79% <0.00%> (-6.23%)`	⬇️
pkg/providers/utils/manifest.go	`42.79% <0.00%> (-2.83%)`	⬇️
pkg/config/config.go	`64.13% <0.00%> (-2.22%)`	⬇️
pkg/apisix/nonexistentclient.go	`41.20% <0.00%> (-2.07%)`	⬇️
pkg/apisix/ssl.go	`35.91% <0.00%> (-0.45%)`	⬇️
pkg/apisix/consumer.go	`36.30% <0.00%> (-0.44%)`	⬇️
pkg/apisix/global_rule.go	`36.05% <0.00%> (-0.44%)`	⬇️
... and 33 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

tokers · 2022-05-30T01:14:20Z

@mangoGoForward Please make the CI pass, thanks! See https://github.com/apache/apisix-ingress-controller/runs/6623221714?check_suite_focus=true.

tokers

Please also add some e2e test cases to cover the SNI route feature.

mangoGoForward · 2022-05-30T01:32:44Z

@mangoGoForward Please make the CI pass, thanks! See https://github.com/apache/apisix-ingress-controller/runs/6623221714?check_suite_focus=true.

I got some connection refused errors, this feature seems wouldn't effect the CI?

mangoGoForward · 2022-05-30T01:33:06Z

Please also add some e2e test cases to cover the SNI route feature.

Thanks, I will do.

mangoGoForward · 2022-05-30T02:59:42Z

Hi @tokers How can I generate a crd? The Makefile seems has no related command.

tao12345666333 · 2022-05-30T05:27:00Z

n I generate a crd? Th

@mangoGoForward Unfortunately, current CRDs are manually maintained. We have #515 to track it.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

tao12345666333 · 2022-06-01T10:51:54Z

Please merge master latest code, and resolve conflicts. Thanks

samples/deploy/crd/v1/ApisixRoute.yaml

Signed-off-by: mango <xu.weiKyrie@foxmail.com> # Conflicts: # test/e2e/suite-features/global_rule.go # test/e2e/suite-ingress/ingress.go

mangoGoForward · 2022-06-02T02:11:49Z

Please merge master latest code, and resolve conflicts. Thanks

OK. I will solve it later.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

tokers · 2022-06-02T09:03:22Z

@mangoGoForward Please make the CI passed, it has some failures. Thanks!

mangoGoForward · 2022-06-02T09:25:39Z

@mangoGoForward Please make the CI passed, it has some failures. Thanks!

OK, I haven't found the the target of this error, it may takes a while to resolve.

tao12345666333 · 2022-07-27T07:40:07Z

@mangoGoForward hi, thanks for your contribution, we plan to enter v1.5 release window.

I have a few suggestions for this PR

I would like to put this PR into v1.6
Currently we have unified all resources to the v2 version of the API, I recommend implementing this feature only for the v2 version of ApisixRoute. Because when the v1.5 version is released, we will mark the v2beta3 version as deprecated. You can check proposal: use a uniform CRD APIVersion #707 for more detail

tao12345666333 · 2022-09-21T01:40:07Z

Hi, do you have time to pick up this one? Thanks

Signed-off-by: mango <xu.weiKyrie@foxmail.com> # Conflicts: # pkg/providers/apisix/translation/apisix_route.go # test/e2e/suite-ingress/suite-ingress-resource/stream.go

mangoGoForward · 2022-09-21T07:04:38Z

Hi, do you have time to pick up this one? Thanks

Yes, the file conflicts solved

tao12345666333 · 2022-09-23T03:28:52Z

@mangoGoForward Thanks for your active contribution!
As I said, we can implement this feature into the v2 API version.

@mangoGoForward hi, thanks for your contribution, we plan to enter v1.5 release window.

I have a few suggestions for this PR

I would like to put this PR into v1.6

Currently we have unified all resources to the v2 version of the API, I recommend implementing this feature only for the v2 version of ApisixRoute. Because when the v1.5 version is released, we will mark the v2beta3 version as deprecated. You can check proposal: use a uniform CRD APIVersion #707 for more detail

samples/deploy/crd/v1/ApisixRoute.yaml

pkg/kube/apisix/apis/config/v2beta3/types.go

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

tao12345666333 · 2022-09-23T08:45:37Z

LGTM !

could you please add e2e test cases to covet this one? thanks!

mangoGoForward · 2022-09-26T03:05:14Z

LGTM !

could you please add e2e test cases to covet this one? thanks!

Sure, but have no time to deal with it recently, I will improve it as soon as possible

tao12345666333 · 2022-10-26T07:41:31Z

Now that we're in the v1.6 development cycle, do you have time to add e2e test cases to covet this one? Thanks!

mangoGoForward · 2022-10-31T03:00:27Z

Now that we're in the v1.6 development cycle, do you have time to add e2e test cases to covet this one? Thanks!

Sorry reply to late, will be completed this week

tao12345666333 · 2022-11-01T06:29:49Z

Thanks! @mangoGoForward

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

tao12345666333

LGTM

But I think a more complete case can be added in e2e.
Create a certificate pair and use it for proxying.

tao12345666333 · 2022-11-04T08:58:13Z

But we can do it in a follow-up PR #1438 @mangoGoForward

mangoGoForward · 2022-11-04T09:12:24Z

LGTM

But I think a more complete case can be added in e2e. Create a certificate pair and use it for proxying.

Thanks, it absolutely need more test cases to cover it. I need to study how the TLS route with SNI works and how to test it, I am so poor about knowledge in this area.

tao12345666333 · 2022-11-04T09:45:33Z

Don't worry, you can continue if you are interested. Otherwise see if others are interested.

mangoGoForward mentioned this pull request May 27, 2022

feat: Support SNI based TLS Route #547

Closed

tao12345666333 added the area/controller label May 27, 2022

tokers reviewed May 30, 2022

View reviewed changes

mangoGoForward force-pushed the feat/support-sni branch from 9c5ad20 to 9180875 Compare May 30, 2022 02:00

mangoGoForward force-pushed the feat/support-sni branch from 9180875 to ed12a07 Compare May 30, 2022 04:13

mangoGoForward force-pushed the feat/support-sni branch from ed12a07 to b2dd8b1 Compare May 30, 2022 10:48

feat: support sni based tls route

d09d14c

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

mangoGoForward force-pushed the feat/support-sni branch from b2dd8b1 to d09d14c Compare May 30, 2022 10:55

tao12345666333 self-assigned this Jun 1, 2022

tokers reviewed Jun 2, 2022

View reviewed changes

samples/deploy/crd/v1/ApisixRoute.yaml Outdated Show resolved Hide resolved

Merge remote-tracking branch 'upstream/master' into feat/support-sni

6c7df7a

Signed-off-by: mango <xu.weiKyrie@foxmail.com> # Conflicts: # test/e2e/suite-features/global_rule.go # test/e2e/suite-ingress/ingress.go

tao12345666333 mentioned this pull request Jun 2, 2022

lint: add yamllint to format yaml files under samples/deploy/ directory #1062

Closed

merged from master branch of upstream

239f002

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

tao12345666333 added the enhancement New feature or request label Jul 27, 2022

tao12345666333 added this to the v1.6.0 milestone Jul 27, 2022

tao12345666333 linked an issue Jul 27, 2022 that may be closed by this pull request

feat: Support SNI based TLS Route #547

Closed

tao12345666333 mentioned this pull request Sep 1, 2022

discuss: New feature in Apache APISIX Ingress controller v1.6 #1309

Closed

18 tasks

Merge remote-tracking branch 'upstream/master' into feat/support-sni

96742a6

Signed-off-by: mango <xu.weiKyrie@foxmail.com> # Conflicts: # pkg/providers/apisix/translation/apisix_route.go # test/e2e/suite-ingress/suite-ingress-resource/stream.go

mangoGoForward closed this Sep 23, 2022

mangoGoForward reopened this Sep 23, 2022

mangoGoForward closed this Sep 23, 2022

mangoGoForward reopened this Sep 23, 2022

tao12345666333 requested changes Sep 23, 2022

View reviewed changes

samples/deploy/crd/v1/ApisixRoute.yaml Outdated Show resolved Hide resolved

pkg/kube/apisix/apis/config/v2beta3/types.go Outdated Show resolved Hide resolved

mangoGoForward added 2 commits September 23, 2022 12:48

move host to v2 api version section

c43a3bf

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

tranfer host in apisixroute to sni

78afcc1

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

add e2e test cases to cover sream route with sni

dd48936

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

tao12345666333 approved these changes Nov 4, 2022

View reviewed changes

tao12345666333 requested review from lingsamuel and AlinsRan November 4, 2022 08:54

gxthrj approved these changes Nov 4, 2022

View reviewed changes

tao12345666333 mentioned this pull request Nov 4, 2022

e2e: add test case for SNI based TLS route #1438

Closed

tao12345666333 merged commit 38b12fb into apache:master Nov 4, 2022

mangoGoForward deleted the feat/support-sni branch November 4, 2022 09:16

cr7258 mentioned this pull request Nov 21, 2022

fix: enable tls for the tcp address apache/apisix-helm-chart#401

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support sni based tls route #1051

feat: support sni based tls route #1051

mangoGoForward commented May 27, 2022

codecov-commenter commented May 27, 2022 •

edited

Loading

tokers commented May 30, 2022

tokers left a comment

mangoGoForward commented May 30, 2022

mangoGoForward commented May 30, 2022

mangoGoForward commented May 30, 2022

tao12345666333 commented May 30, 2022

tao12345666333 commented Jun 1, 2022

mangoGoForward commented Jun 2, 2022

tokers commented Jun 2, 2022

mangoGoForward commented Jun 2, 2022

tao12345666333 commented Jul 27, 2022

tao12345666333 commented Sep 21, 2022

mangoGoForward commented Sep 21, 2022

tao12345666333 commented Sep 23, 2022 •

edited

Loading

tao12345666333 commented Sep 23, 2022

mangoGoForward commented Sep 26, 2022

tao12345666333 commented Oct 26, 2022

mangoGoForward commented Oct 31, 2022

tao12345666333 commented Nov 1, 2022

tao12345666333 left a comment

tao12345666333 commented Nov 4, 2022

mangoGoForward commented Nov 4, 2022

tao12345666333 commented Nov 4, 2022

feat: support sni based tls route #1051

feat: support sni based tls route #1051

Conversation

mangoGoForward commented May 27, 2022

Type of change:

What this PR does / why we need it:

Pre-submission checklist:

codecov-commenter commented May 27, 2022 • edited Loading

Codecov Report

tokers commented May 30, 2022

tokers left a comment

Choose a reason for hiding this comment

mangoGoForward commented May 30, 2022

mangoGoForward commented May 30, 2022

mangoGoForward commented May 30, 2022

tao12345666333 commented May 30, 2022

tao12345666333 commented Jun 1, 2022

mangoGoForward commented Jun 2, 2022

tokers commented Jun 2, 2022

mangoGoForward commented Jun 2, 2022

tao12345666333 commented Jul 27, 2022

tao12345666333 commented Sep 21, 2022

mangoGoForward commented Sep 21, 2022

tao12345666333 commented Sep 23, 2022 • edited Loading

tao12345666333 commented Sep 23, 2022

mangoGoForward commented Sep 26, 2022

tao12345666333 commented Oct 26, 2022

mangoGoForward commented Oct 31, 2022

tao12345666333 commented Nov 1, 2022

tao12345666333 left a comment

Choose a reason for hiding this comment

tao12345666333 commented Nov 4, 2022

mangoGoForward commented Nov 4, 2022

tao12345666333 commented Nov 4, 2022

codecov-commenter commented May 27, 2022 •

edited

Loading

tao12345666333 commented Sep 23, 2022 •

edited

Loading