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

Define TLS options on the Router configuration #4931

Merged
merged 10 commits into from Jun 17, 2019
Merged

Define TLS options on the Router configuration #4931

merged 10 commits into from Jun 17, 2019

Conversation

jbdoumenjou
Copy link
Member

What does this PR do?

Allow to use TLS options on a Router

Motivation

Allow to define specific TLS options for each Router

More

  • Added/updated tests
  • Added/updated documentation

Additional Notes

Co-authored-by: juliens julien@containo.us

@traefiker traefiker added this to the 2.0 milestone Jun 4, 2019
@jbdoumenjou jbdoumenjou added this to To review in v2 via automation Jun 4, 2019
@jbdoumenjou jbdoumenjou added the kind/enhancement a new or improved feature. label Jun 4, 2019
@ldez ldez changed the title Add a reference to the TLS options on the Router configuration Define TLS options on the Router configuration Jun 4, 2019
juliens
juliens approved these changes Jun 4, 2019
View reviewed changes
Copy link
Member

@juliens juliens left a comment

Choose a reason for hiding this comment

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

LGTM

@juliens juliens force-pushed the feature/tls-options branch 2 times, most recently from aeebf8c to 61facf8 Compare June 5, 2019 10:44
@jbdoumenjou jbdoumenjou force-pushed the feature/tls-options branch 2 times, most recently from 8ed3edb to a3afe39 Compare June 11, 2019 12:34
ldez
ldez approved these changes Jun 11, 2019
View reviewed changes
Copy link
Member

@ldez ldez left a comment

Choose a reason for hiding this comment

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

LGTM

mpl
mpl reviewed Jun 17, 2019
View reviewed changes
Copy link
Collaborator

@mpl mpl left a comment

Choose a reason for hiding this comment

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

Only doc comments for now. Code review afterwards.
Some changes are probably needed for http-tls/overview.md as well, but I'll work on them with @ldez and add them to the PR afterwards if you don't mind.

docs/content/routing/routers/index.md Outdated Show resolved Hide resolved
docs/content/routing/routers/index.md Outdated Show resolved Hide resolved
docs/content/routing/routers/index.md Outdated Show resolved Hide resolved
docs/content/routing/routers/index.md Outdated Show resolved Hide resolved
docs/content/routing/routers/index.md Outdated Show resolved Hide resolved
docs/content/routing/routers/index.md Outdated Show resolved Hide resolved
docs/content/routing/routers/index.md Outdated Show resolved Hide resolved
mpl
mpl reviewed Jun 17, 2019
View reviewed changes
pkg/config/dyn_config.go Outdated Show resolved Hide resolved
pkg/config/dyn_config.go Show resolved Hide resolved
pkg/server/router/router.go Show resolved Hide resolved
pkg/server/router/tcp/router.go Outdated Show resolved Hide resolved
pkg/server/router/tcp/router.go Show resolved Hide resolved
pkg/tcp/router.go Outdated Show resolved Hide resolved
pkg/tls/tlsmanager.go Outdated Show resolved Hide resolved
pkg/tls/tlsmanager.go Outdated Show resolved Hide resolved
pkg/tcp/router.go Outdated Show resolved Hide resolved
pkg/tcp/router.go Outdated Show resolved Hide resolved
mpl
mpl approved these changes Jun 17, 2019
View reviewed changes
Copy link
Collaborator

@mpl mpl left a comment

Choose a reason for hiding this comment

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

LGTM

@ldez ldez changed the base branch from v2.0 to master June 17, 2019 15:45
@ldez ldez changed the base branch from master to v2.0 June 17, 2019 15:45
@traefiker traefiker merged commit 85ce16b into traefik:v2.0 Jun 17, 2019
v2 automation moved this from To review to Done Jun 17, 2019
@jbdoumenjou jbdoumenjou deleted the feature/tls-options branch November 15, 2019 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliens juliens juliens approved these changes

@mpl mpl mpl approved these changes

@ldez ldez ldez approved these changes

Assignees
No one assigned
Labels
area/tls kind/enhancement a new or improved feature. size/L
Projects
No open projects
v2
Done
Milestone
2.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jbdoumenjou @juliens @mpl @ldez @dduportal @traefiker