988189cf9f
add more testing for mergeAlternativeBackends
...
- fix edge cases caught by new testing
2018-11-26 10:00:57 -05:00
003027b800
Merge pull request #3443 from aledbf/initial-reload
...
Remove initial log error during reconfiguration
2018-11-21 05:44:54 -08:00
5d4dc78926
Remove initial log error during reconfiguration
2018-11-21 09:28:04 -03:00
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
a5341822d5
Increase log level when there is an invalid size value
2018-11-20 15:09:03 -03:00
12766cdfc6
Use struct to pack Ingress and its annotations
2018-11-20 09:38:22 -05:00
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
82721e575d
Merge pull request #3372 from Shopify/session-cookie-path
...
Add annotation for session affinity path
2018-11-19 07:25:32 -08:00
50b29feb4a
Add annotation for session affinity path
2018-11-19 09:15:24 -05:00
af2dce901d
Fix tests
2018-11-18 08:17:18 -03:00
654eceda46
Add tcp e2e test
2018-11-16 21:07:52 -03:00
168f30d1ec
Revert removal of support for TCP and UDP services
2018-11-16 13:48:47 -03:00
ec28539e43
bugfix: do not merge catch-all canary backends with itself
2018-11-13 13:20:15 -05:00
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
0f3e2b9bf0
Convert isValidClientBodyBufferSize to something more generic and use it for client_max_body_size
2018-11-13 10:11:40 -05:00
2850fb538a
fix logging calls
2018-11-13 16:02:27 +08:00
5f3b48e16d
breaking change: do not trust x-forwarded-* headers by default
2018-11-13 10:35:59 +04:00
950a2f9174
Merge pull request #3387 from xichengliudui/fix181109
...
Modify the wrong function name
2018-11-09 06:14:55 -08:00
d2b1d37ee3
Modify the wrong function name
2018-11-08 15:17:40 -05:00
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
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
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
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
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
08d5ffabbf
Merge pull request #3367 from aledbf/503-restart
...
Remove reloads when there is no endpoints
2018-11-06 06:39:04 -08:00
3838145a8c
Remove reloads when there is no endpoints
2018-11-06 09:26:04 -03:00
ecf605bf60
Merge pull request #3369 from SataQiu/fix-20181106
...
Fix some typos
2018-11-06 04:02:10 -08:00
c19f7eb1df
Merge pull request #3370 from xichengliudui/fix181106
...
Fix typo: whitlelist -> whitelist
2018-11-06 04:00:49 -08:00
a13ea30e6d
Fix typo: whitlelist -> whitelist
2018-11-06 04:59:03 -05:00
76b5a7b45e
fix typos
2018-11-06 15:58:56 +08:00
4b518ec03c
Fix some typos
...
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-05 22:10:11 +08:00
ce6e564f82
merge from master
2018-11-02 13:13:24 +08:00
71ebe1cba5
Code linting
2018-10-30 20:46:48 -03:00
bec97b36c7
Merge pull request #3321 from mbode/geoip2
...
Add configuration for geoip2 module
2018-10-30 05:09:38 -07:00
c27c57dc8b
Add configuration for geoip2 module
...
Based on closed PRs #2551 , #2755
2018-10-29 21:25:23 +01:00
fed013ab6f
Fix status update in case of connection errors
2018-10-29 13:01:41 -03:00
ad57c76b73
Support cookie expires
2018-10-29 15:21:10 +08:00
3cbfd63992
Refactor EWMA to not use shared dictionaries
2018-10-25 22:33:42 +04:00
9f2a0b6363
Add healthcheck timeout as CLA
2018-10-24 16:02:28 -04:00
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
cdb244e579
fix two bugs with backend-protocol annotation
2018-10-19 09:11:21 -04:00
dc553d8f91
Refactor probe url requests
2018-10-15 16:29:32 -03:00
1b63ca355f
Improve dynamic lua confguration
2018-10-12 14:29:41 -03:00
9af9ef5fd9
Merge pull request #3230 from reactiveops/backoff-dynamic-config
...
Retry initial backend configuration
2018-10-12 10:01:21 -07:00
e0020e22d1
Switch to using wait.ExponentialBackoff
2018-10-12 09:19:20 -04:00
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
ee6bb942e5
Retry initial backend configuration
2018-10-12 00:12:59 -04:00
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
4c46ee95c9
Update leader election methods
2018-10-10 21:46:45 -03:00
3038da8719
Merge pull request #3215 from hchenxa/hchenxa
...
align opentracing user-guide with nginx configmap configuration
2018-10-10 06:56:15 -07:00
3edf11b85f
Merge pull request #3198 from aledbf/only-dynamic
...
Only support dynamic configuration
2018-10-10 05:07:34 -07:00
f8052385f9
aline opentracing user-guide with nginx configmap configuration
2018-10-10 11:25:53 +08:00
74c2f93de6
Only support dynamic configuration
2018-10-09 22:05:45 -03:00
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
3686e4f366
Move escapeLocationPathVar to escapeLiteralDollar
2018-10-09 12:58:50 -07:00
78f12c25c5
delete upstream healthcheck annotation
2018-10-09 09:14:13 -04:00
859b298d42
Remove annotations grpc-backend and secure-backend already deprecated
2018-10-08 12:26:06 -03:00
3dc131bd57
Make literal $ character work in set $location_path
2018-10-07 12:58:39 -07:00
44bdc7eb59
Remove support for TCP and UDP services
2018-10-07 10:53:37 -03:00
bd3f56eaa0
allow curly braces to be used in regex paths
2018-10-04 10:58:38 -04:00
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
f29bdc3e8d
Add 'use regex' annotation to toggle nginx regex location modifier
2018-10-01 13:54:11 -04:00
a7c2633e4e
remove payload from log ( #3135 )
2018-09-26 12:09:14 -03:00
b3a22f7fc0
do not require --default-backend-service
2018-09-25 21:14:28 -04:00
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
7212d0081b
Provide possibility to block CIDRs, User-Agents and Referers globally
2018-09-25 14:16:20 +03:00
91ae204f6c
Replace standard json encoding with jsoniter
2018-09-22 14:25:01 -03:00
0de19c8062
Fix/add unit tests; Styling changes
2018-09-14 15:07:57 -04:00
0e6f0bb88d
enforce ^~ location modifier when rewrite-target annotation is set
2018-09-13 10:39:52 -04:00
281318b4b6
Replace client-go deprecated method
2018-09-10 14:42:10 -03:00
361f06b791
Join host/port with go helper (supports ipv6)
2018-09-09 16:34:18 -03:00
66486203db
fix: Don't try and find local certs when secretName is not specified
...
Fixes #3048
2018-09-06 11:35:16 +01:00
3f6314aa2f
Merge pull request #3016 from diazjf/better-logging
...
Log Errors Missing in Internal
2018-09-05 05:18:33 -07:00
9099f3b4db
add support for http2-max-requests in configmap
2018-09-02 23:53:30 -06:00
b0e242fe73
Add support for valgrind
2018-08-30 21:32:06 -03:00
10de8cac56
Log Errors Missing in Internal
...
Adds a few missing errors and fix formatting for others.
Fixes #3013
2018-08-30 15:02:42 -05:00
16fce7444f
Check if cgroup cpu limits are defined to get the number of CPUs
2018-08-25 18:34:44 -03:00
db947e344e
Fix formatting args
2018-08-25 12:18:28 -03:00
cbf041fc3e
Add Lua module to serve SSL Certificates dynamically
2018-08-23 22:15:54 -04:00
dc952dc462
consistently fallback to default certificate when TLS is configured
2018-08-22 20:53:25 -04:00
c083599a4b
Merge pull request #2899 from jeroenvand/jvd-fix-rewrite
...
fixed rewrites for paths not ending in /
2018-08-19 02:49:22 -07:00
7faf089082
Add dynamic certificate feature to controller
2018-08-16 20:19:33 -04:00
b5bcb93a4b
Merge branch 'master' into xff
2018-08-16 18:15:14 +02:00
e428095e3c
fixed rewrites for paths not ending in /
2018-08-15 21:15:40 +02:00
3f5af6eecf
Merge pull request #2889 from hnrytrn/dynamic-cert-endpoint
...
Add Lua endpoint to support dynamic certificate serving functionality
2018-08-13 10:49:43 -07:00
f311668625
Add misspell target
2018-08-11 08:26:14 -04:00
6d9772ce00
fix: Sort TCP/UDP upstream order ( #2885 )
...
Fixes #2721
2018-08-10 07:09:14 -04:00
7af93e03c7
Add annotation backend-protocol
2018-08-07 08:59:38 -04:00
5200a38bd7
Add lua endpoint to handle certificates in dynamic configuration mode
2018-08-07 08:18:34 -04:00
7f7f59df79
Merge pull request #2894 from aledbf/authbind
...
Use authbind to bind privileged ports
2018-08-05 08:43:43 -07:00
b148f113ae
Use authbind to bind privileged ports
2018-08-05 11:18:50 -04:00
9b3207d4c6
Merge pull request #2897 from aledbf/enable-reuseport
...
Enable reuse-port by default
2018-08-04 19:43:43 -07:00
060704c624
Merge pull request #2682 from aledbf/listen-localhost
...
Use localhost to expose status server
2018-08-04 17:16:56 -07:00
6b2c7e08db
Use localhost to expose status server
2018-08-04 18:57:56 -04:00
1d00a5c2bc
Enable reuse-port by default
2018-08-04 17:43:34 -04:00
b7bcf92480
support configuring multi_accept directive via configmap
2018-08-04 19:20:01 +03:00
1bacf1655e
support custom configuration to main context of nginx config
2018-08-04 00:53:06 +03:00
23ce9b5db1
Merge pull request #2808 from dongqi1990/bugfix-2799
...
fix the bug #2799 , add prefix (?i) in rewrite statement.
2018-08-02 20:58:06 -07:00
72a2aa171a
fix the bug #2799 , add prefix (?i) in rewrite statement and add new e2e
...
test.
2018-07-30 17:34:28 +08:00
8a67ace5c3
enable dynamic backend configuration by default
2018-07-26 15:16:06 -04:00
a2692ce946
fix issues introduced in #2804
2018-07-26 14:23:51 -04:00
d4faf68416
add support for ExternalName service type in dynamic mode
2018-07-25 09:05:47 -04:00
237dcd7aa7
Merge pull request #2811 from takonomura/escape-request-uri
...
Escape $request_uri for external auth
2018-07-21 02:23:38 -07:00
496fb9d3b8
Merge pull request #2812 from dongqi1990/bugfix--rewrite-to
...
modified annotation name "rewrite-to" to "rewrite-target" in comments
2018-07-19 02:38:41 -07:00
568512fdb8
modified annotation name "rewrite-to" to "rewrite-target" in comments
2018-07-19 17:14:18 +08:00
587c2a8765
Escape $request_uri for external auth
2018-07-19 15:22:05 +09:00
c783c08d81
Remove KubeConfig Dependency for Store Tests
...
Removes the KubeConfig Dependency for the Store Test by using the
FakeClient Instead. Unit Tests should not rely on a real KubeConfig.
Fixes #2789
2018-07-17 11:13:41 -05:00
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
1542a12764
Refactor controller metrics interface
2018-07-12 12:46:34 -04:00
bdd2c5e3be
Merge pull request #2767 from aledbf/fix-regression
...
Fix regression introduced in #2732
2018-07-10 08:51:25 -07:00
601315039e
Fix regression introduced in #2732
2018-07-10 10:29:45 -04:00
14426c60b8
Fix ingress rule parsing error
2018-07-09 18:30:11 -04:00
8e06afbb45
Allow gzip compress level to be controlled via ConfigMap
2018-07-09 10:30:59 +10:00
85d1742283
fix: Use the correct opentracing plugin for Jaeger
...
Part of #2738
2018-07-05 19:09:12 +01:00
472dcb371b
Clarify log messages in controller pkg
2018-07-02 22:59:54 +02:00
bc53d1eb74
Sample rate configmap option for zipkin in nginx-opentracing
2018-06-28 18:13:31 +03:00
c0ed143fbd
Merge pull request #2368 from antoineco/fix-typos
...
[aggregate] Fix typos across codebase
2018-06-24 17:26:02 -07:00
02219bdfb8
Improve best-cert guessing with empty tls.hosts
2018-06-25 01:59:50 +02:00
130866b51c
Proofreading
2018-06-25 00:04:43 +02:00
0951b973c9
Fix initial read of configuration configmap ( #2692 )
2018-06-23 09:08:48 -04:00
0dbc9a2973
Merge pull request #2681 from AdamDang/patch-4
...
Typo fix in error message: encounted->encountered
2018-06-22 12:35:07 -07:00
700a2275d1
Merge pull request #2678 from hnrytrn/refactor-cert
...
Refactor server type to include SSLCert
2018-06-22 12:34:04 -07:00
56b74d9fac
Typo fix in error message: encounted->encountered
...
encounted->encountered
2018-06-22 13:59:23 +08:00
df76d4b481
Update opentracing configuration ( #2676 )
2018-06-21 18:15:18 -04:00
86def984a3
Merge remote-tracking branch 'origin' into refactor-cert
2018-06-21 11:43:47 -04:00
2751cbf06d
Refactor to add SSLCert as a field in server type
2018-06-21 11:34:29 -04:00
aec40c171f
Improve configuration change detection ( #2656 )
...
* Use information about the configuration configmap to determine changes
* Add hashstructure dependency
* Rename queue functions
* Add test for configmap checksum
2018-06-21 10:50:57 -04:00
779676145b
After a configmap change parse ingress annotations (again)
2018-06-21 08:47:06 -04:00
da7bf10631
Merge pull request #2658 from aledbf/initial-configuration
...
Do not wait informer initialization to read configuration
2018-06-17 09:52:30 -07:00
408391175f
Do not wait informer initialization to read configuration
2018-06-17 12:27:12 -04:00
f782929eb5
Remove dummy file watcher
2018-06-16 18:49:08 -04:00
3cbd2d66bf
Merge pull request #2643 from aledbf/remove-vts
...
Remove VTS from the ingress controller
2018-06-14 23:59:29 -07:00
aeab7035f8
fix nginx conf test error when not found active service endpoints
2018-06-15 08:10:03 +08:00
63b38e1c21
Remove VTS from the ingress controller
2018-06-14 11:11:29 -04:00
2cd2da7c3f
Create UDP collector that listens to UDP messages from monitor.lua and exposes them on /metrics endpoint
2018-06-13 21:31:51 -04:00
47bea35492
Clarify log messages in controller pkg
2018-06-13 21:27:43 +02:00
35a6d508fb
Set use-forwarded-headers to true by default.
2018-06-12 21:33:34 +02:00
7ded31d7a8
Create file permission constants
2018-06-12 11:06:14 -04:00
79199dd84c
Run as user dropping privileges
2018-06-12 10:18:36 -04:00
67b253a149
Add use-forwarded-headers configmap option.
2018-06-11 00:06:14 +02:00
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
d637a9b978
Configurable Proxy Protocol header timeout for TLS passthrough
2018-06-03 20:10:41 -05:00
f3e9292c04
Always sort upstream list to provide stable iteration order
2018-06-02 17:07:14 -04:00
a7a1f41702
Typo fix: successfull->successful
...
successfull->successful
2018-06-02 19:44:48 +08:00
c97d6e1110
log annotation should be set for catch-all servers
2018-05-31 16:01:54 -04:00
2023e56115
Fix default-backend annotation
2018-05-26 19:09:24 -04:00
7d8a0130a5
use better defaults for proxy-next-upstream(-tries)
2018-05-23 21:37:56 -04:00
b8b5e5bc51
Merge pull request #2548 from Stono/master
...
Implement generate-request-id
2018-05-21 13:55:12 -07:00
206d32a2cd
Implement generate-request-id
...
Fixes https://github.com/kubernetes/ingress-nginx/issues/2546
2018-05-21 08:32:50 +01:00
d434583b53
InfluxDB configuration string template builder helper
...
Signed-off-by: Lorenzo Fontana <lo@linux.com>
2018-05-19 09:22:49 +02:00
Conor Landry
k8s-ci-robot
Manuel Alejandro de Brito Fontes
Maxime Ginters
Zenara Daley
mikeweiwei
Elvin Efendi
xichengliudui
Fernando Diaz
jasongwartz
SataQiu
mooncake
liuwei
Maximilian Bode
Henry Tran
Aarni Koskela
Corey O'Brien
Hui Chen
Bryan Shelton
Zenara Daley
Pavel Sinkevych
Mike Bryant
Derek Perkins
Dario Nieuwenhuis
Jeroen van Dongen
Mike Bryant
Tom Reznik
dongqi1990
takonomura
Jason Stangroome
Antoine Cotten
Andrii Kostenko
AdamDang
chenqz1987
Francisco Mejia
Jason Roberts
Karl Stoney
Lorenzo Fontana