Commit Graph

304 Commits

Author SHA1 Message Date
Manuel Alejandro de Brito Fontes 2fa55eabf6 Replace glog with klog 2018-12-05 13:27:55 -03:00
Manuel Alejandro de Brito Fontes 06d33c16b5
Allow to disable NGINX metrics 2018-12-05 10:14:35 -03:00
Kubernetes Prow Robot c4ba23832a
Merge pull request #3474 from aledbf/improve-parsing
Improve parsing of annotations and use of Ingress wrapper
2018-12-05 03:33:18 -08:00
Manuel Alejandro de Brito Fontes 497246f8ba
Annotations cannot being empty 2018-12-02 16:07:46 -03:00
Manuel Alejandro de Brito Fontes f78e2e3849
Only copy fields being used 2018-12-02 15:35:36 -03:00
Manuel Alejandro de Brito Fontes 67808c0ed8
Improve parsing of annotations and use of Ingress wrapper 2018-12-02 15:35:36 -03:00
Elvin Efendi 4eabd535f9 be consistent with what Nginx supports 2018-12-02 22:20:56 +04:00
Kubernetes Prow Robot ccd7b890fd
Merge pull request #3492 from aledbf/fix-units
Fix data size validations
2018-12-02 09:01:12 -08:00
Andre Marianiello b80b19902a Use opentracing_grpc_propagate_context when necessary 2018-12-01 16:31:10 -05:00
k8s-ci-robot 24f3e508b4
Merge pull request #3446 from Shopify/add_tests_merge_canary
add more testing for mergeAlternativeBackends
2018-11-30 14:22:44 -08:00
Manuel Alejandro de Brito Fontes 6098f6c0e7
Fix data size validations 2018-11-30 10:40:33 -03:00
Elvin Efendi e93763da6a delete unused LoadBalanceAlgorithm 2018-11-28 14:49:37 +04:00
Elvin Efendi 60569137ca delete unused buildLoadBalancingConfig 2018-11-28 11:55:41 +04:00
k8s-ci-robot 710ea8c76f
Merge pull request #3333 from Shopify/dont-trust-by-default
breaking change: by default do not trust any client
2018-11-27 05:12:48 -08:00
Maxime Ginters b6b221aebb Watch controller Pods list 2018-11-26 15:35:31 -05:00
Conor Landry 988189cf9f add more testing for mergeAlternativeBackends
- fix edge cases caught by new testing
2018-11-26 10:00:57 -05:00
k8s-ci-robot 003027b800
Merge pull request #3443 from aledbf/initial-reload
Remove initial log error during reconfiguration
2018-11-21 05:44:54 -08:00
Manuel Alejandro de Brito Fontes 5d4dc78926
Remove initial log error during reconfiguration 2018-11-21 09:28:04 -03:00
k8s-ci-robot c99716aadf
Merge pull request #3437 from Shopify/ingress-annotations
Use struct to pack Ingress and its annotations
2018-11-21 00:41:58 -08:00
Manuel Alejandro de Brito Fontes a5341822d5 Increase log level when there is an invalid size value 2018-11-20 15:09:03 -03:00
Maxime Ginters 12766cdfc6 Use struct to pack Ingress and its annotations 2018-11-20 09:38:22 -05:00
k8s-ci-robot 96f5ae6668
Merge pull request #3417 from Shopify/fix_canary_merge_self_def
bugfix: do not merge catch-all canary backends with itself
2018-11-20 05:03:52 -08:00
k8s-ci-robot 82721e575d
Merge pull request #3372 from Shopify/session-cookie-path
Add annotation for session affinity path
2018-11-19 07:25:32 -08:00
Zenara Daley 50b29feb4a Add annotation for session affinity path 2018-11-19 09:15:24 -05:00
Manuel Alejandro de Brito Fontes af2dce901d
Fix tests 2018-11-18 08:17:18 -03:00
Manuel Alejandro de Brito Fontes 654eceda46
Add tcp e2e test 2018-11-16 21:07:52 -03:00
Manuel Alejandro de Brito Fontes 168f30d1ec Revert removal of support for TCP and UDP services 2018-11-16 13:48:47 -03:00
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
Elvin Efendi 5f3b48e16d breaking change: do not trust x-forwarded-* headers by default 2018-11-13 10:35:59 +04: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