Commit Graph

276 Commits

Author SHA1 Message Date
Manuel Alejandro de Brito Fontes 168f30d1ec Revert removal of support for TCP and UDP services 2018-11-16 13:48:47 -03: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
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
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
mooncake 4b518ec03c Fix some typos
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-05 22:10:11 +08:00
liuwei ce6e564f82 merge from master 2018-11-02 13:13:24 +08:00
Manuel Alejandro de Brito Fontes 71ebe1cba5 Code linting 2018-10-30 20:46:48 -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
Henry Tran 3cbfd63992 Refactor EWMA to not use shared dictionaries 2018-10-25 22:33:42 +04:00
Zenara Daley 9f2a0b6363 Add healthcheck timeout as CLA 2018-10-24 16:02:28 -04: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
Elvin Efendi cdb244e579 fix two bugs with backend-protocol annotation 2018-10-19 09:11:21 -04:00
Manuel Alejandro de Brito Fontes dc553d8f91 Refactor probe url requests 2018-10-15 16:29:32 -03:00
Manuel Alejandro de Brito Fontes 1b63ca355f
Improve dynamic lua confguration 2018-10-12 14:29:41 -03:00
k8s-ci-robot 9af9ef5fd9
Merge pull request #3230 from reactiveops/backoff-dynamic-config
Retry initial backend configuration
2018-10-12 10:01:21 -07:00
Corey O'Brien e0020e22d1 Switch to using wait.ExponentialBackoff 2018-10-12 09:19:20 -04:00
k8s-ci-robot 0baf62dd6a
Merge pull request #3222 from diazjf/add-timeouts-and-such
Allow Ability to Configure Upstream Keepalive
2018-10-12 06:15:09 -07:00
Corey O'Brien ee6bb942e5 Retry initial backend configuration 2018-10-12 00:12:59 -04:00
Fernando Diaz 12955a4a1b Allow Ability to Configure Upstream Keepalive
Allows Upstream Keepalive values like keepalive_timeout and
keepalive_requests to be configured via ConfigMap.

Fixes #3099
2018-10-11 20:46:42 -05:00
Manuel Alejandro de Brito Fontes 4c46ee95c9
Update leader election methods 2018-10-10 21:46:45 -03:00
k8s-ci-robot 3038da8719
Merge pull request #3215 from hchenxa/hchenxa
align opentracing user-guide with nginx configmap configuration
2018-10-10 06:56:15 -07:00
k8s-ci-robot 3edf11b85f
Merge pull request #3198 from aledbf/only-dynamic
Only support dynamic configuration
2018-10-10 05:07:34 -07:00
Hui Chen f8052385f9 aline opentracing user-guide with nginx configmap configuration 2018-10-10 11:25:53 +08:00
Manuel Alejandro de Brito Fontes 74c2f93de6
Only support dynamic configuration 2018-10-09 22:05:45 -03:00
k8s-ci-robot f56ab42cd2
Merge pull request #3194 from bshelton229/literal-dollar-character
Make literal $ character work in set $location_path
2018-10-09 15:52:39 -07:00
Bryan Shelton 3686e4f366 Move escapeLocationPathVar to escapeLiteralDollar 2018-10-09 12:58:50 -07:00
Elvin Efendi 78f12c25c5 delete upstream healthcheck annotation 2018-10-09 09:14:13 -04:00
Manuel Alejandro de Brito Fontes 859b298d42 Remove annotations grpc-backend and secure-backend already deprecated 2018-10-08 12:26:06 -03:00
Bryan Shelton 3dc131bd57 Make literal $ character work in set $location_path 2018-10-07 12:58:39 -07:00
Manuel Alejandro de Brito Fontes 44bdc7eb59 Remove support for TCP and UDP services 2018-10-07 10:53:37 -03:00
Zenara Daley bd3f56eaa0 allow curly braces to be used in regex paths 2018-10-04 10:58:38 -04:00
k8s-ci-robot d9f58144eb
Merge pull request #3145 from Shopify/regex-modifier
Add "use-regex" Annotation to Toggle Regular Expression Location Modifier
2018-10-01 11:31:43 -07:00
Zenara Daley f29bdc3e8d Add 'use regex' annotation to toggle nginx regex location modifier 2018-10-01 13:54:11 -04:00
Zenara Daley a7c2633e4e remove payload from log (#3135) 2018-09-26 12:09:14 -03:00