Skip to content

Conversation

@jbdoumenjou
Copy link
Collaborator

What does this PR do?

Merge current v2.2 branch into master

Motivation

Be sync.

mpl and others added 24 commits June 15, 2020 12:20
Co-authored-by: Julien Salleyron <julien@containo.us>
Co-authored-by: Romain <rtribotte@users.noreply.github.com>
Co-authored-by: Jean-Baptiste Doumenjou <jb.doumenjou@gmail.com>
* remove checkStringQuoteValidity in loadIngressRouteConf

* remove checkStringQuoteValidity and related tests in crd

* remove checkStringQuoteValidity from ingress and related tests

Co-authored-by: traefiker <30906710+traefiker@users.noreply.github.com>
Headers middleware doesn't support `accessControlAllowOrigin` option
anymore, it should print a list of values from
`accessControlAllowOriginList`.
* tests: add tests to show race condition on provider config

* fix: store a deep copy of previous provider config

* fix: send a deep copy of provdier config to watcher listener
* added required quotes to domains config

otherwise syntax is incorrect

* review.

Co-authored-by: Fernandez Ludovic <ludovic@containo.us>
Co-authored-by: jbdoumenjou <jb.doumenjou@gmail.com>
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

@traefiker traefiker removed bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-ff status/3-needs-merge labels Jul 10, 2020
@traefiker traefiker merged commit 73ca7ad into traefik:master Jul 10, 2020
@jbdoumenjou jbdoumenjou deleted the mrg-current-v2.2 branch July 22, 2020 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.