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

Remove old global config and use new static config #4222

Merged
merged 4 commits into from
Nov 27, 2018
Merged

Remove old global config and use new static config #4222

merged 4 commits into from
Nov 27, 2018

Conversation

juliens
Copy link
Member

@juliens juliens commented Nov 23, 2018

What does this PR do?

Defines a new static configuration.

More

  • Added/updated tests

Additional Notes

Adds a section for the providers, like the following:

[providers]
   [providers.docker]
      #...
   [providers.file]
      #...

Global Configuration Changes

Global configuration options now belong to the new Global section

[Global]
  Debug = true
  CheckNewVersion = true
  SendAnonymousUsage = true

This avoids users being confused why the following didn't work

[file]
   # file provider configuration 
   # ...

CheckNewVersion = true # misplaced configuration option

Adds two transport sections, one to configure the transport between Traefik and the servers, and one to configure the transport between Traefik and the clients.

[ServersTransport]
  InsecureSkipVerify = true
  RootCAs = ["foobar", "foobar"]
  MaxIdleConnsPerHost = 42
  [serversTransport.ForwardingTimeouts]
    DialTimeout = 42
    ResponseHeaderTimeout = 42

[entrypoints]
  [entrypoints.xxx.transport]
    aaaa = true
  [entrypoints.xxx.transport.RespondingTimeouts]
    ReadTimeout = 42
    WriteTimeout = 42
    IdleTimeout = 42
  [entrypoints.xxx.transport.LifeCycle]
    RequestAcceptGraceTimeout = 42
    GraceTimeOut = 42

Misc

  • ProvidersThrottleDuration is moved to the providers section.
  • No more certificates configured on entrypoints other than the DefaultCertificate
  • Removes the default entrypoints option (routers that don't specify entrypoints will be connected to all of them by default)

@mmatur mmatur added this to the next milestone Nov 23, 2018
mmatur
mmatur requested changes Nov 23, 2018
View reviewed changes
Copy link
Member

@mmatur mmatur left a comment

Choose a reason for hiding this comment

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

First review before the weekend.
Nice job folks!! 👏

cmd/configuration.go Outdated Show resolved Hide resolved
cmd/configuration.go Outdated Show resolved Hide resolved
cmd/traefik/traefik.go Outdated Show resolved Hide resolved
config/static/entrypoints.go Outdated Show resolved Hide resolved
config/static/entrypoints.go Outdated Show resolved Hide resolved
config/static/entrypoints.go Outdated Show resolved Hide resolved
config/static/entrypoints.go Outdated Show resolved Hide resolved
config/static/entrypoints.go Outdated Show resolved Hide resolved
config/static/entrypoints.go Outdated Show resolved Hide resolved
ldez
ldez approved these changes Nov 26, 2018
View reviewed changes
Copy link
Contributor

@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

jbdoumenjou
jbdoumenjou approved these changes Nov 26, 2018
View reviewed changes
Copy link
Member

@jbdoumenjou jbdoumenjou left a comment

Choose a reason for hiding this comment

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

LGTM

dtomcej
dtomcej approved these changes Nov 26, 2018
View reviewed changes
Copy link
Contributor

@dtomcej dtomcej left a comment

Choose a reason for hiding this comment

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

LGTM
:shipit:

mmatur
mmatur approved these changes Nov 27, 2018
View reviewed changes
Copy link
Member

@mmatur mmatur 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 requested a review from a team as a code owner November 27, 2018 16:10
juliens and others added 4 commits November 27, 2018 17:12
@juliens @geraldcroes
Remove old global config and use new static config
93f3075 
Co-authored-by: Gérald Croës <gerald@containo.us>
@juliens @geraldcroes
Modify integration tests
eaea189 
Co-authored-by: Gérald Croës <gerald@containo.us>
@juliens
Fix review
274d302
@juliens
Fix review
f765043
@ldez ldez removed the request for review from a team November 27, 2018 16:14
@traefiker traefiker merged commit 5d91c7e into traefik:master Nov 27, 2018
@ldez ldez deleted the feature/static_configuration branch July 15, 2019 17:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtomcej dtomcej dtomcej approved these changes

@ldez ldez ldez approved these changes

@mmatur mmatur mmatur approved these changes

@jbdoumenjou jbdoumenjou jbdoumenjou approved these changes

Assignees
No one assigned
Labels
area/server kind/enhancement a new or improved feature. size/L
Projects
None yet
Milestone
2.0
Development

Successfully merging this pull request may close these issues.
6 participants
@juliens @jbdoumenjou @mmatur @ldez @dtomcej @traefiker