Commit graph

3490 commits

Author SHA1 Message Date
Manuel Alejandro de Brito Fontes
debf024921
Fix modsecurity configuration file location (#3408) 2018-11-12 13:56:39 -03:00
k8s-ci-robot
01a343cd09
Merge pull request #3407 from Shopify/rr-e2e
Restructure load balance e2e tests and update round robin test
2018-11-12 08:48:02 -08:00
k8s-ci-robot
97b9bf9558
Merge pull request #3406 from aledbf/update-image
Update nginx and e2e image
2018-11-12 08:10:36 -08:00
Zenara Daley
8b32c4c326 Restructure load balance e2e tests and update round robin test 2018-11-12 10:19:52 -05:00
Manuel Alejandro de Brito Fontes
ddd8eef8d0
Update nginx image (#3404) 2018-11-12 11:51:48 -03:00
Manuel Alejandro de Brito Fontes
e20d651ceb Update nginx and e2e image 2018-11-12 11:29:18 -03:00
k8s-ci-robot
14fe4898a7
Merge pull request #3395 from mooncak/fix_doc_issue
Fix some documents issues
2018-11-11 04:00:20 -08:00
mooncake
2d64e15f95 Fix some documents issues
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-10 19:33:51 +08:00
k8s-ci-robot
55104c90b2
Merge pull request #3390 from Shopify/rr-e2e
Add e2e test for round robin load balancing
2018-11-09 11:22:41 -08:00
Manuel Alejandro de Brito Fontes
5cc139999a
Fix link in documentation [skip ci] (#3392) 2018-11-09 15:57:20 -03:00
Zenara Daley
95db733c12 add e2e test for round robin load balancing 2018-11-09 13:20:33 -05: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
k8s-ci-robot
5928bc5389
Merge pull request #3388 from crystaljade/patch-5
Update annotations.md. Remove Duplication.
2018-11-09 05:51:31 -08:00
crystaljade
50e30b47ff
Update annotations.md 2018-11-09 20:19:22 +08:00
k8s-ci-robot
889ead8b55
Merge pull request #3382 from mooncak/fix_bug
Fix typos: reqrite -> rewrite
2018-11-09 02:04:52 -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
k8s-ci-robot
92e540d509
Merge pull request #3379 from mikeweiwei/my_fix
Fix typos
2018-11-08 04:51:57 -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
k8s-ci-robot
b5a43db683
Merge pull request #3377 from SataQiu/fix-20181107
Fix typos and default value
2018-11-07 03:42:04 -08:00
SataQiu
76aae20b64 fix the typos 2018-11-07 17:53:17 +08:00
k8s-ci-robot
0d102812fd
Merge pull request #3373 from aledbf/update-nginx
Update nginx
2018-11-06 23:02:46 -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
Manuel Alejandro de Brito Fontes
1f1b1039c9
Update nginx 2018-11-06 18:55:22 -03: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
Manuel Alejandro de Brito Fontes
38f5df26cb
Fix links format [skip-ci] (#3364) 2018-11-05 06:50:49 -03:00
k8s-ci-robot
19cc5e5b96
Merge pull request #3345 from xichengliudui/fix181102
update annotation
2018-11-04 12:58:15 -08:00
k8s-ci-robot
adc05756f0
Merge pull request #3356 from tariq1890/use_dep_release
Download latest dep releases instead of fetching from HEAD
2018-11-04 10:08:05 -08:00
Manuel Alejandro de Brito Fontes
bc5934d806
Add missing modsecurity unicode.mapping file (#3357) 2018-11-04 12:35:33 -03:00
k8s-ci-robot
6b7f0f129b
Merge pull request #3347 from diazjf/ssl-redirect-e2e
Add e2e test for ssl-redirect
2018-11-04 04:56:32 -08:00
Fernando Diaz
290488a505 Add e2e test for ssl-redirect
Adds the e2e test for the ssl-redirect annotation.
Part of the #3124 effort.
2018-11-04 03:16:03 -06:00
tariqibrahim
41b171080c download latest dep releases instead of fetching from HEAD 2018-11-03 16:50:29 -07:00
Manuel Alejandro de Brito Fontes
2e858f36ab
Update nginx image (#3354) 2018-11-03 20:35:02 -03:00
Manuel Alejandro de Brito Fontes
1978bed594
Update nginx modules (#3353) 2018-11-03 19:29:07 -03:00
k8s-ci-robot
1f76acfa6a
Merge pull request #3349 from xiezongzhe/patch-8
fix typo
2018-11-02 18:59:19 -07:00
k8s-ci-robot
8db67b268c
Merge pull request #3348 from crystaljade/patch-2
Update cli-arguments.md. Remove tcp and udp, add health-check-timeout.
2018-11-02 07:47:55 -07:00