Commit graph

3645 commits

Author SHA1 Message Date
k8s-ci-robot
5d43fbea33 Merge pull request #3410 from mikeweiwei/fix_glog
fix logging calls
2018-11-13 02:28:23 -08:00
mikeweiwei
00a83f9cbf fix logging calls 2018-11-13 16:02:27 +08:00
Elvin Efendi
2c255a7215 breaking change: do not trust x-forwarded-* headers by default 2018-11-13 10:35:59 +04:00
k8s-ci-robot
6d3e02ad57 Merge pull request #3405 from Shopify/external-auth-proto
Prevent X-Forwarded-Proto forward during external auth subrequest
2018-11-12 12:36:20 -08:00
Manuel Alejandro de Brito Fontes
c10a0bf6cc Fix modsecurity configuration file location (#3408) 2018-11-12 13:56:39 -03:00
k8s-ci-robot
703e6af536 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
dbf0bbcdd3 Merge pull request #3406 from aledbf/update-image
Update nginx and e2e image
2018-11-12 08:10:36 -08:00
Zenara Daley
abd3093bb8 Restructure load balance e2e tests and update round robin test 2018-11-12 10:19:52 -05:00
Manuel Alejandro de Brito Fontes
abad6bf14e Update nginx image (#3404) 2018-11-12 11:51:48 -03:00
Manuel Alejandro de Brito Fontes
9f75001d1f Update nginx and e2e image 2018-11-12 11:29:18 -03:00
Maxime Ginters
e65478e544 Prevent X-Forwarded-Proto forward during external auth subrequest 2018-11-12 09:13:48 -05:00
k8s-ci-robot
56bdc575fa Merge pull request #3395 from mooncak/fix_doc_issue
Fix some documents issues
2018-11-11 04:00:20 -08:00
mooncake
a3601797be Fix some documents issues
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-10 19:33:51 +08:00
k8s-ci-robot
a2da31c4c1 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
e7cf193ecf Fix link in documentation [skip ci] (#3392) 2018-11-09 15:57:20 -03:00
Zenara Daley
8a6a28504e add e2e test for round robin load balancing 2018-11-09 13:20:33 -05:00
k8s-ci-robot
9f8e56da42 Merge pull request #3387 from xichengliudui/fix181109
Modify the wrong function name
2018-11-09 06:14:55 -08:00
k8s-ci-robot
da614359c7 Merge pull request #3388 from crystaljade/patch-5
Update annotations.md. Remove Duplication.
2018-11-09 05:51:31 -08:00
crystaljade
fbce4ee45b Update annotations.md 2018-11-09 20:19:22 +08:00
k8s-ci-robot
f8d106db25 Merge pull request #3382 from mooncak/fix_bug
Fix typos: reqrite -> rewrite
2018-11-09 02:04:52 -08:00
xichengliudui
19a1d63909 Modify the wrong function name 2018-11-08 15:17:40 -05:00
mooncake
1f6e414b37 Fix typos: reqrite -> rewrite
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-09 00:54:51 +08:00
k8s-ci-robot
ca97a92f60 Merge pull request #3379 from mikeweiwei/my_fix
Fix typos
2018-11-08 04:51:57 -08:00
mikeweiwei
8f82650d65 Fix typos 2018-11-08 17:04:46 +08:00
k8s-ci-robot
fe33eab705 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
ad2497e240 Merge pull request #3377 from SataQiu/fix-20181107
Fix typos and default value
2018-11-07 03:42:04 -08:00
SataQiu
ac7c4e51f5 fix the typos 2018-11-07 17:53:17 +08:00
k8s-ci-robot
db06290594 Merge pull request #3373 from aledbf/update-nginx
Update nginx
2018-11-06 23:02:46 -08:00
Fernando Diaz
e4da2ba052 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
cb8a8405d4 Update nginx 2018-11-06 18:55:22 -03:00
k8s-ci-robot
619ae2fca1 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
0f6357764a 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
3fc5579f19 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
8dec650d28 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
9fedb2a606 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
b57b975e5a Merge pull request #3343 from abaruni/auth-snippet
Auth snippet
2018-11-06 04:37:34 -08:00
Manuel Alejandro de Brito Fontes
37c2bbb99a Remove reloads when there is no endpoints 2018-11-06 09:26:04 -03:00
k8s-ci-robot
795e56b3d1 Merge pull request #3369 from SataQiu/fix-20181106
Fix some typos
2018-11-06 04:02:10 -08:00
k8s-ci-robot
7454094d1b Merge pull request #3370 from xichengliudui/fix181106
Fix typo: whitlelist -> whitelist
2018-11-06 04:00:49 -08:00
xichengliudui
228640822b Fix typo: whitlelist -> whitelist 2018-11-06 04:59:03 -05:00
SataQiu
29406312de fix typos 2018-11-06 15:58:56 +08:00
Adnan Baruni
fb261ebaeb 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
9bd475fd0d Merge pull request #3366 from mooncak/fix_typos
Fix some typos
2018-11-05 07:45:35 -08:00
mooncake
3f909fe2e1 Fix some typos
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-05 22:10:11 +08:00
Manuel Alejandro de Brito Fontes
437297c8a3 Fix links format [skip-ci] (#3364) 2018-11-05 06:50:49 -03:00
k8s-ci-robot
6396596bd6 Merge pull request #3345 from xichengliudui/fix181102
update annotation
2018-11-04 12:58:15 -08:00
k8s-ci-robot
19e7121e10 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
a293225612 Add missing modsecurity unicode.mapping file (#3357) 2018-11-04 12:35:33 -03:00
k8s-ci-robot
b66d881e5f 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
c184084461 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