Commit graph

443 commits

Author SHA1 Message Date
mooncake
2d64e15f95 Fix some documents issues
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-10 19:33:51 +08:00
Manuel Alejandro de Brito Fontes
5cc139999a
Fix link in documentation [skip ci] (#3392) 2018-11-09 15:57:20 -03:00
crystaljade
50e30b47ff
Update annotations.md 2018-11-09 20:19:22 +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
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
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
Manuel Alejandro de Brito Fontes
38f5df26cb
Fix links format [skip-ci] (#3364) 2018-11-05 06:50:49 -03: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
Angga Lanuma
c4834e5063 fix baremetal.md link 2018-10-31 00:13:21 +07:00
Maximilian Bode
c27c57dc8b Add configuration for geoip2 module
Based on closed PRs #2551, #2755
2018-10-29 21:25:23 +01:00
Sebastiaan van Steenis
4c25bfe75a Fix links in deploy index docs 2018-10-29 14:07:54 +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
k8s-ci-robot
063f652711
Merge pull request #3187 from DesmondHoLLM/feature/annotations-resty-lua
UPT: annotation enhancement for resty-lua-waf
2018-10-25 00:06:03 -07:00
Desmond Ho
bf03046a80 UPT: updated e2e test and default true for process-multipart-body annotation 2018-10-25 14:17:38 +08:00
Fernando Diaz
d6dcc3a681 Add Better Documentation for using AuthTLS (#3275)
Enhances the documentation for enabling and using Mutual Authentication.
2018-10-22 16:15:28 -03: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
Ray Foss
4c3001bdc1
not a script 2018-10-15 16:03:56 -05:00
Ray Foss
dfacb6cb8e
Clarify mandatory script doc
The warnings should probably be above the script, not below, especially in the ever popular GKE, where they are prerequisites. Generic Deployment sounds like it's a deployment that should work on all vanilla Kubernetes installations. It sounds like an OR logic operator, when it should be an AND.
2018-10-15 15:41:47 -05:00
Ricardo Katz
f444c4ee7f
Add a note to the deployment into GKE 2018-10-14 15:50:20 -03: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
k8s-ci-robot
3c1a5c5fc2
Merge pull request #3166 from gabel/patch-1
Added ingress tls values.yaml example to documentation
2018-10-10 10:19:12 -07:00
k8s-ci-robot
12b4a1b0f4
Merge pull request #3212 from SgtCoDFish/master
Add some extra detail to the client cert auth example regarding potential gotcha
2018-10-10 06:57:45 -07:00
Hui Chen
f8052385f9 aline opentracing user-guide with nginx configmap configuration 2018-10-10 11:25:53 +08:00
Ashley Davis
72de2600d7 Add some extra detail to the client cert auth example
Multiple people within my work organisation were caught out by the fact
that the trusted client cert issuers must be given in a file named
`ca.crt` and that other filenames will fail to work.

This change makes it more clear to those who stumble across the
documentation that this is a potential gotcha.
2018-10-09 22:51:00 +01: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
mooncake
df79cd8e58 remove duplication 2018-10-07 23:05:23 +08: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
Martin F
64c68b61e9
Added ingress tls values.yaml example to documentation
In the live documentation (mkdocs) the file is hidden. A link only would still hide the content, so adding the content to the docs itself.
2018-10-02 08:22:12 +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
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
Marc Spitzer
751d76c7eb
update name of config map 2018-09-30 10:51:42 +08:00
Elvin Efendi
14815c546c update docs 2018-09-25 21:49:37 -04:00
Max Braitmaiere
d1b678c1d4
multi-tls readme to reference the file
Makes the doc on https://kubernetes.github.io/ingress-nginx/examples/multi-tls/ clearer by pointing to the example file, not directory context there as in Github
2018-09-25 20:41:19 +03:00