Commit Graph

245 Commits

Author SHA1 Message Date
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
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
crystaljade 8f93b9847d
Update cli-arguments.md 2018-11-02 13:48:00 +08:00
crystaljade b80540c3af
Update cli-arguments.md 2018-11-02 13:17:52 +08:00
Maximilian Bode c27c57dc8b Add configuration for geoip2 module
Based on closed PRs #2551, #2755
2018-10-29 21:25:23 +01:00
xichengliudui ed107a489a Delete some extra words 2018-10-29 02:48:56 -04:00
samuela decdf72f26 "diretly" typo (#3263)
* "diretly" typo
2018-10-27 08:17:45 -03:00
Desmond Ho bf03046a80 UPT: updated e2e test and default true for process-multipart-body annotation 2018-10-25 14:17:38 +08: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
Hui Chen 32b95be1bb the sample ingress spec error 2018-10-19 18:15:13 +08:00
Ricardo Katz 091c914bab Add missing annotations to Docs (#3264)
Add missing annotations to Docs
2018-10-18 12:38:37 -03:00
Hui Chen b276800d2c remote the command args of enable-dynamic-configuration 2018-10-16 10:52:19 +08: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
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 469797e242
Fix documentation links [skip ci] (#3229) 2018-10-11 22:09:01 -03:00
Hui Chen f8052385f9 aline opentracing user-guide with nginx configmap configuration 2018-10-10 11:25:53 +08:00
Elvin Efendi 78f12c25c5 delete upstream healthcheck annotation 2018-10-09 09:14:13 -04:00
k8s-ci-robot 9cf4f9e7ae
Merge pull request #3209 from ms4720/master
Fix: update config map name
2018-10-09 03:59:28 -07:00
Marc Spitzer 2387c38624 Fix: update config map name 2018-10-09 11:15:09 +08:00
Manuel Alejandro de Brito Fontes 859b298d42 Remove annotations grpc-backend and secure-backend already deprecated 2018-10-08 12:26:06 -03:00
k8s-ci-robot b46523a1f4
Merge pull request #3149 from diazjf/proxy-e2e-tests
Add e2e Tests for Proxy Annotations
2018-10-05 05:15:09 -07:00
Zenara Daley bd3f56eaa0 allow curly braces to be used in regex paths 2018-10-04 10:58:38 -04:00
Yann 6d9977b622 Fix yaml indentation in server-snippet doc
Copy / Pasting the code made errors when injecting config in
kubernetes cluster. With this change, annotations now works
in ingresses metadata.
2018-10-03 19:31:14 +02:00
Fernando Diaz c981a65058 Add e2e Tests for Proxy Annotations
Adds e2e tests for the following annotations:

- proxy-body-size
- proxy-connect-timeout
- proxy-send-timeout
- proxy-read-timeout
- proxy-buffering
- proxy-buffer-size
- proxy-request-buffering
- proxy-next-upstream
- proxy-next-upstream-tries
- proxy-cookie-domain
- proxy-cookie-path

and also updates some documentation.
2018-10-01 16:10:09 -05:00
Zenara Daley f29bdc3e8d Add 'use regex' annotation to toggle nginx regex location modifier 2018-10-01 13:54:11 -04:00
Elvin Efendi 14815c546c update docs 2018-09-25 21:49:37 -04:00
k8s-ci-robot 6393ca6aaf
Merge pull request #2997 from StarOfService/global-block-ip-ua-ref
Provide possibility to block IPs, User-Agents and Referers globally
2018-09-25 05:51:56 -07:00
Pavel Sinkevych 7212d0081b Provide possibility to block CIDRs, User-Agents and Referers globally 2018-09-25 14:16:20 +03:00
Rui Cao 0853a9f4f5 Typo fix: adresses -> addresses
Signed-off-by: Rui Cao <ruicao@alauda.io>
2018-09-24 22:51:16 +08:00
Hui Chen be87141fe7 doc issue related to monitor part 2018-09-20 17:34:07 +08:00
Hui Chen aff2400ea4 update annotation name from rewrite-log to enable-rewrite-log 2018-09-17 11:54:25 +08:00
Mitchell Turner ccc3b6354e Added notes to regarding external access 2018-09-14 12:11:22 -04:00
Manuel de Brito Fontes 4ffe3a2fdd
Update mkdocs 2018-09-13 17:52:15 -03:00
Antoine Cotten a99f56dcbe
Complete documentation about SSL Passthrough 2018-09-10 19:41:27 +02:00
Manuel Alejandro de Brito Fontes e60cbc4804
Remove link to invalid example [ci-skip] (#3039) 2018-09-04 20:13:47 -03:00
Derek Perkins 9099f3b4db add support for http2-max-requests in configmap 2018-09-02 23:53:30 -06:00
k8s-ci-robot a92555f4cb
Merge pull request #3017 from diazjf/more-e2e-1
Add e2e tests for CORS
2018-09-02 16:00:41 -07:00
Fernando Diaz 2a990d2d2c Add e2e tests for CORS and more
Adds the missing e2e tests for Cross-Origin Resource Sharing(CORS).
This will include all the CORS annotations. Also adds more unit tests.
2018-09-01 16:14:52 -05:00
Manuel de Brito Fontes f5dda5fecc
Fix documentation format 2018-08-30 15:31:12 -03:00
Henry Tran 0af9d5b62a Add documentation for enable-dynamic-certificates feature 2018-08-24 09:51:41 -04:00
Dario Nieuwenhuis b5bcb93a4b
Merge branch 'master' into xff 2018-08-16 18:15:14 +02:00
k8s-ci-robot 01cc29e17b
Merge pull request #2912 from aledbf/prometheus-grafana
Add documentation to install prometheus and grafana
2018-08-13 09:03:08 -07:00
Lorenzo Fontana 5c680ba629
docs: Precisations on the usage of the InfluxDB module
Signed-off-by: Lorenzo Fontana <lo@linux.com>
2018-08-12 11:24:06 +02:00
Manuel de Brito Fontes f311668625 Add misspell target 2018-08-11 08:26:14 -04:00
Manuel de Brito Fontes 322dae6cee
Add documentation to install prometheus and grafana 2018-08-08 18:44:18 -04:00
Manuel de Brito Fontes 7af93e03c7
Add annotation backend-protocol 2018-08-07 08:59:38 -04:00
Manuel Alejandro de Brito Fontes a68820808a
Fix documentation (#2902) 2018-08-05 22:30:46 -04:00
k8s-ci-robot 9b3207d4c6
Merge pull request #2897 from aledbf/enable-reuseport
Enable reuse-port by default
2018-08-04 19:43:43 -07:00
Manuel Alejandro de Brito Fontes d31f5ec31a
Fix default sync-period doc (#2898) 2018-08-04 17:57:15 -04:00
Manuel de Brito Fontes 1d00a5c2bc Enable reuse-port by default 2018-08-04 17:43:34 -04:00
Tom Reznik b7bcf92480 support configuring multi_accept directive via configmap 2018-08-04 19:20:01 +03:00
Tom Reznik 1bacf1655e support custom configuration to main context of nginx config 2018-08-04 00:53:06 +03:00
Karl Stoney 09832557ed
Add permanent-redirect-code annotation 2018-07-29 11:50:16 +02:00
Elvin Efendi 8a67ace5c3 enable dynamic backend configuration by default 2018-07-26 15:16:06 -04:00
Vincent Gramer 9024d2f451 doc log-format: add variables about ingress 2018-07-19 17:38:38 +02:00
Fernando Diaz 52ecdf0b46 Add Better Error Handling for SSLSessionTicketKey
Adds more error handling when writing an SSLSessionTicketKey to
the config map. Also adds tests and makes the function for modular.

Fixes #2756
2018-07-15 19:53:39 -05:00
Manuel Alejandro de Brito Fontes 3b947eb90d
Update docs and mkdoc dependencies [ci skip] (#2778) 2018-07-13 19:23:13 -04:00
Info-Screen e2f4d2cdaa
Use language neutral links to MDN insetead of es 2018-07-10 04:23:56 +02:00
Jason Stangroome 8e06afbb45 Allow gzip compress level to be controlled via ConfigMap 2018-07-09 10:30:59 +10:00
Andrii Kostenko bc53d1eb74
Sample rate configmap option for zipkin in nginx-opentracing 2018-06-28 18:13:31 +03:00
Antoine Cotten 130866b51c
Proofreading 2018-06-25 00:04:43 +02:00
Fernando Diaz 7370694609 Enhance Distributed Tracing Documentation
Corrects a few items in the Zipkin Collector Example. Adds a Example
of setting up the Jaeger Collector.
2018-06-23 23:51:46 -05:00
jstoja 0cfd6dca83 Add documentation for proxy-cookie-domain annotation (#2034) 2018-06-19 22:25:57 +02:00
Manuel de Brito Fontes 63b38e1c21
Remove VTS from the ingress controller 2018-06-14 11:11:29 -04:00
Dario Nieuwenhuis 4dfc83a698 Capitalize NGINX in docs. 2018-06-13 21:10:56 +02:00
Antoine Cotten 55679aa268 Update documentation for custom error pages (#2630)
* Update documentation for custom error pages

* custom-error-pages: Fix path to error pages

Bump version to 0.2
2018-06-12 18:03:48 -04:00
Dario Nieuwenhuis 94266ff167 Document use-forwarded-headers configmap option. 2018-06-12 21:48:32 +02:00
Jian Qiu 92182596eb Add annotation doc on proxy buffer size 2018-06-12 16:06:30 +08:00
Antoine Cotten a74c34dbf1
Proofread cmd package and update flags description 2018-06-11 13:15:45 +02:00
k8s-ci-robot fa9823634c
Merge pull request #2504 from jrthrawny/proxy-protocol-timeout-for-passthrough-pr
Add Timeout For TLS Passthrough
2018-06-03 22:54:53 -07:00
Jason Roberts d637a9b978 Configurable Proxy Protocol header timeout for TLS passthrough 2018-06-03 20:10:41 -05:00
Borek Bernard fcfa4f2eb0
Improved link in modsecurity.md 2018-05-30 09:25:12 +02:00
Tobias Bradtke 0c2aa4bc98
Fix wrong default value for `enable-brotli`
Brotli is disabled by default since c67e9185b6
2018-05-24 17:36:32 +02:00
Elvin Efendi 7d8a0130a5 use better defaults for proxy-next-upstream(-tries) 2018-05-23 21:37:56 -04:00
k8s-ci-robot b8b5e5bc51
Merge pull request #2548 from Stono/master
Implement generate-request-id
2018-05-21 13:55:12 -07:00
Karl Stoney 206d32a2cd Implement generate-request-id
Fixes https://github.com/kubernetes/ingress-nginx/issues/2546
2018-05-21 08:32:50 +01:00
Lorenzo Fontana 93be8db612
Annotations for the InfluxDB Module
Signed-off-by: Lorenzo Fontana <lo@linux.com>
2018-05-19 09:22:46 +02:00
k8s-ci-robot aa256ac887
Merge pull request #2423 from diazjf/fix-2074
Resolves issue with proxy-redirect nginx configuration
2018-05-18 12:42:51 -07:00
Roman Sokolkov d004fcac05
DOCS: Correct ssl-passthrough annotation description. 2018-05-18 17:22:21 +02:00
Fernando Diaz e224259e38 Resolves issue with proxy-redirect nginx configuration
Resolves an issue where the proxy-redirect annotations were not generating the
correct configuration possibly because of user error. This is done by only
setting the proxy_redirect if both proxy-redirect-from and proxy-redirect-to
have valid values. Also adds the e2e tests.

Fixes #2074
2018-05-17 11:22:31 -05:00
k8s-ci-robot 2e53fa21e6
Merge pull request #2517 from gmile/patch-1
Fix typo about the kind of request
2018-05-16 15:51:50 -07:00
Manuel de Brito Fontes a085808d2d
Add tests for bind-address 2018-05-16 14:53:29 -04:00
Eugene Pirogov 552df3bdcd
Fix typo about the kind of request 2018-05-16 09:53:17 +03:00
Mike Tougeron 17e5b35f10 Add some clarification around multiple ingress controller behavior 2018-05-11 16:10:41 -07:00
Aarni Koskela f1e5c9b2dd Clean up annotations.md; extract default backend from miscellaneous 2018-05-03 15:44:57 +03:00
Aarni Koskela 4b85ef9c9c Add note about changing annotation prefixes 2018-05-03 14:42:47 +03:00
Aarni Koskela b66efdd8bd Reformat log-format.md 2018-05-03 14:42:47 +03:00
Aarni Koskela 572aac4421 multiple-ingress.md: rework page for clarity and less repetition 2018-05-03 14:42:47 +03:00
Aarni Koskela ed48199b30 TLS.md: Remove useless manual TOC 2018-05-02 17:49:18 +03:00
Aarni Koskela ec56200ee0 TLS.md: Reformat and grammar check 2018-05-02 17:49:15 +03:00
Aarni Koskela aca5097a56 TLS.md: Remove the frankly useless curl output in the default certificate section 2018-05-02 17:49:13 +03:00
Aarni Koskela f65c8f0aaa TLS.md: Clarify how to set --default-ssl-certificate 2018-05-02 17:49:11 +03:00
Aarni Koskela 451a01bb0a TLS.md: Move the TLS secret misc bit to the TLS document 2018-05-02 17:49:06 +03:00
Manuel de Brito Fontes d97bf0675a Add gRPC annotation doc 2018-04-30 14:29:29 -03:00
Francisco de Brito Fontes 2f6f9a29ba Improve documentation format 2018-04-29 03:17:29 -03:00
k8s-ci-robot 0813b38314
Merge pull request #2437 from JordanP/rewrite_log
Add annotation to enable rewrite logs in a location
2018-04-27 10:27:19 -07:00
JordanP c995031ffd Add annotation to enable rewrite logs in a location 2018-04-27 17:50:14 +02:00