Commit Graph

373 Commits

Author SHA1 Message Date
Conor Landry ec28539e43 bugfix: do not merge catch-all canary backends with itself 2018-11-13 13:20:15 -05:00
k8s-ci-robot a22c656f30
Merge pull request #3409 from Shopify/client-max-body-size
Convert isValidClientBodyBufferSize to something more generic
2018-11-13 08:36:06 -08:00
Maxime Ginters 0f3e2b9bf0 Convert isValidClientBodyBufferSize to something more generic and use it for client_max_body_size 2018-11-13 10:11:40 -05:00
mikeweiwei 2850fb538a fix logging calls 2018-11-13 16:02:27 +08:00
k8s-ci-robot 950a2f9174
Merge pull request #3387 from xichengliudui/fix181109
Modify the wrong function name
2018-11-09 06:14:55 -08:00
xichengliudui d2b1d37ee3 Modify the wrong function name 2018-11-08 15:17:40 -05:00
mooncake b3d789edca Fix typos: reqrite -> rewrite
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-09 00:54:51 +08:00
mikeweiwei b85f1fa551 Fix typos 2018-11-08 17:04:46 +08:00
k8s-ci-robot d97999c07d
Merge pull request #3309 from diazjf/modsecurity-location
Customize ModSecurity to be used in Locations
2018-11-07 09:29:01 -08:00
SataQiu 76aae20b64 fix the typos 2018-11-07 17:53:17 +08:00
Fernando Diaz 5195600841 Allows ModSecurity to be configured per location
The following annotations will be added:

- enable-modsecurity
- enable-owasp-core-rules
- modsecurity-transaction-id

Fixes #3167
2018-11-06 22:24:31 -06:00
k8s-ci-robot 17cad51e47
Merge pull request #3341 from Shopify/canary_upstream
Add canary annotation and alternative backends for traffic shaping
2018-11-06 12:22:16 -08:00
Conor Landry 412cd70d3a implement canary annotation and alternative backends
Adds the ability to create alternative backends. Alternative backends enable
traffic shaping by sharing a single location but routing to different
backends depending on the TrafficShapingPolicy defined by AlternativeBackends.

When the list of upstreams and servers are retrieved, we then call
mergeAlternativeBackends which iterates through the paths of every ingress
and checks if the backend supporting the path is a AlternativeBackend. If
so, we then iterate through the map of servers and find the real backend
that the AlternativeBackend should fall under. Once found, the
AlternativeBackend is embedded in the list of VirtualBackends for the real
backend.

If no matching real backend for a AlternativeBackend is found, then the
AlternativeBackend is deleted as it cannot be backed by any server.
2018-11-06 13:13:14 -05:00
k8s-ci-robot 265f96bf14
Merge pull request #3344 from ecosia/jg-customerrors-per-ingress
Adds CustomHTTPErrors ingress annotation and test
2018-11-06 09:21:49 -08:00
jasongwartz 0ebf0354cb Adds CustomHTTPErrors ingress annotation and test
Adds per-server/location error-catch functionality to nginx template

Adds documentation

Reduces template duplication with helper function for CUSTOM_ERRORS data

Updates documentation

Adds e2e test for customerrors

Removes AllCustomHTTPErrors, replaces with template function with deduplication and adds e2e test of deduplication

Fixes copy-paste error in test, adds additional test cases

Reverts noop change in controller.go (unused now)
2018-11-06 16:47:52 +01:00
k8s-ci-robot 08d5ffabbf
Merge pull request #3367 from aledbf/503-restart
Remove reloads when there is no endpoints
2018-11-06 06:39:04 -08:00
k8s-ci-robot d53b492d73
Merge pull request #3343 from abaruni/auth-snippet
Auth snippet
2018-11-06 04:37:34 -08:00
Manuel Alejandro de Brito Fontes 3838145a8c
Remove reloads when there is no endpoints 2018-11-06 09:26:04 -03:00
k8s-ci-robot ecf605bf60
Merge pull request #3369 from SataQiu/fix-20181106
Fix some typos
2018-11-06 04:02:10 -08:00
k8s-ci-robot c19f7eb1df
Merge pull request #3370 from xichengliudui/fix181106
Fix typo: whitlelist -> whitelist
2018-11-06 04:00:49 -08:00
xichengliudui a13ea30e6d Fix typo: whitlelist -> whitelist 2018-11-06 04:59:03 -05:00
SataQiu 76b5a7b45e fix typos 2018-11-06 15:58:56 +08:00
Adnan Baruni b511333130 add support for auth-snippet annotation
add test for new auth-snippet annotation

document auth-snippet annotation

add e2e test for auth-snippet annotation

add log warning and update documentation
2018-11-05 16:02:29 -06:00
k8s-ci-robot b4c5af1b85
Merge pull request #3366 from mooncak/fix_typos
Fix some typos
2018-11-05 07:45:35 -08:00
mooncake 4b518ec03c Fix some typos
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-05 22:10:11 +08:00
k8s-ci-robot 19cc5e5b96
Merge pull request #3345 from xichengliudui/fix181102
update annotation
2018-11-04 12:58:15 -08:00
liuwei c74e59fa4c Use second as cookie expires unit 2018-11-02 17:05:38 +08:00
liuwei ce6e564f82 merge from master 2018-11-02 13:13:24 +08:00
xichengliudui 648f8dfc20 update annotation 2018-11-01 23:50:08 -04:00
Manuel Alejandro de Brito Fontes 71ebe1cba5 Code linting 2018-10-30 20:46:48 -03:00
Manuel Alejandro de Brito Fontes c9668dd40b
Fix e2e tests 2018-10-30 13:35:31 -03:00
k8s-ci-robot bec97b36c7
Merge pull request #3321 from mbode/geoip2
Add configuration for geoip2 module
2018-10-30 05:09:38 -07:00
Maximilian Bode c27c57dc8b Add configuration for geoip2 module
Based on closed PRs #2551, #2755
2018-10-29 21:25:23 +01:00
Manuel Alejandro de Brito Fontes fed013ab6f Fix status update in case of connection errors 2018-10-29 13:01:41 -03:00
liuwei ad57c76b73 Support cookie expires 2018-10-29 15:21:10 +08:00
xichengliudui ed107a489a Delete some extra words 2018-10-29 02:48:56 -04:00
Henry Tran 3cbfd63992 Refactor EWMA to not use shared dictionaries 2018-10-25 22:33:42 +04:00
k8s-ci-robot bc6f2e7016
Merge pull request #3285 from Shopify/probe-timeout
Add health-check-timeout as command line argument
2018-10-25 06:31:32 -07:00
k8s-ci-robot 063f652711
Merge pull request #3187 from DesmondHoLLM/feature/annotations-resty-lua
UPT: annotation enhancement for resty-lua-waf
2018-10-25 00:06:03 -07:00
Desmond Ho bf03046a80 UPT: updated e2e test and default true for process-multipart-body annotation 2018-10-25 14:17:38 +08:00
Zenara Daley 9f2a0b6363 Add healthcheck timeout as CLA 2018-10-24 16:02:28 -04:00
k8s-ci-robot 9fe500319c
Merge pull request #3282 from SataQiu/fix-20181024
Fix some typos
2018-10-24 06:00:09 -07:00
SataQiu 51fffc653d fix typos 2018-10-24 20:30:56 +08:00
Aarni Koskela 4a71111d4c Fix usages of %q formatting for numbers (%d)
This caused logs like "Adjusting ServerNameHashBucketSize variable to '@'"
2018-10-23 18:21:16 +03:00
Desmond Ho bab521e81a UPT: align waf options 2018-10-20 12:46:39 +08:00
Desmond Ho 04a89ce234 UPT: annotation enhancement for resty-lua-waf 2018-10-20 12:09:38 +08:00
Elvin Efendi cdb244e579 fix two bugs with backend-protocol annotation 2018-10-19 09:11:21 -04:00
k8s-ci-robot ad89a93a29
Merge pull request #3195 from diazjf/auth-tls-e2e
Add e2e Tests for AuthTLS
2018-10-19 03:02:43 -07:00
k8s-ci-robot 12fba876c3
Merge pull request #3270 from ukinau/Fix-3269-sort-should-be-done-before-pass-to-update-status
Don't sort IngressStatus from each Goroutine(update for each ingress)
2018-10-19 02:46:54 -07:00
Yuki Nishiwaki 4845daeb35 Don't sort IngressStatus from each Goroutine(update for each ingress)
Currently ingress controller try to update status for each ingress
resource in a parallel by using Goroutine, and inside this Goroutine we
are trying to sort same IngressStatus reference which is shared between
all Goroutine, this will break the original refrence if some Goroutine
tried to sort exact same time.
So we should have done sorting before passing reference to each
Goroutine to prevent from breaking original reference

fixes: #3269
2018-10-19 11:10:31 +08:00