Commit graph

899 commits

Author SHA1 Message Date
Manuel de Brito Fontes
cf82f694de Avoid negative values configuring the max number of open files 2017-03-30 10:10:47 -03:00
Manuel Alejandro de Brito Fontes
752672866b Merge pull request #523 from ankon/patch-2
Fix a typo in an error message
2017-03-30 08:54:00 -03:00
Marcin Owsiany
ed65647c78 Drop superfluous dependencies in top-level Makefile. 2017-03-30 13:06:39 +02:00
Andreas Kohn
33715a9c8e Fix a typo in an error message 2017-03-30 13:00:31 +02:00
Manuel Alejandro de Brito Fontes
e385c05a80 Merge pull request #517 from ashb/nginx-configmap-ipwhitelist
Use whitelist-source-range from configmap when no annotation on ingress.
2017-03-29 09:33:43 -03:00
Ash Berlin
6ac7a12a60 Use whitelist-source-range from configmap when no annotation on ingress.
Even though we were returning a SourceRange it was being ignored because
we were also returning an error. Detect the case (and add tests) when
the annotation is not present and use the BackendConfig in that case.

Fixes #473.
2017-03-29 13:09:03 +01:00
Manuel Alejandro de Brito Fontes
39feaf10df Merge pull request #516 from aledbf/workers-auto
Convert WorkerProcesses setting to string to allow the value auto
2017-03-28 19:59:22 -03:00
Manuel de Brito Fontes
1278a97dc6 Convert WorkerProcesses setting to string to allow the value auto 2017-03-28 19:58:09 -03:00
Manuel Alejandro de Brito Fontes
0aaffc964b Merge pull request #514 from caiyixiang/haproxy_multi_tls
add example for haproxy multi tsl
2017-03-28 08:33:18 -03:00
caiyixiang
776dc4a6f3 add example for haproxy multi tsl 2017-03-28 16:13:53 +08:00
Manuel Alejandro de Brito Fontes
68831cbcb8 Merge pull request #512 from ankon/patch-1
Fix typos regarding the ssl-passthrough annotation documentation
2017-03-27 16:09:17 -03:00
Andreas Kohn
9dcac88b3d Fix typos regarding the ssl-passthrough annotation documentation 2017-03-27 10:19:21 +02:00
Manuel Alejandro de Brito Fontes
e2c7a536e9 Merge pull request #505 from chentao1596/annotations_unittest
add unit test cases for core/pkg/ingress/controller/annotations
2017-03-26 23:56:22 -03:00
chentao1596
767591fa18 remove unused constants 2017-03-27 10:11:40 +08:00
chentao1596
6ab3a21971 add unit test cases for core/pkg/ingress/controller/annotations 2017-03-27 10:06:07 +08:00
Manuel Alejandro de Brito Fontes
a7af8409c8 Merge pull request #504 from jcmoraisjr/jm-haproxy-client-cert-auth
HAProxy Ingress - client cert auth docs
2017-03-26 19:07:14 -03:00
Joao Morais
b2c6276f0e [docs] haproxy ingress - client cert auth 2017-03-26 18:31:10 -03:00
Manuel Alejandro de Brito Fontes
a355c5a674 Merge pull request #500 from jcmoraisjr/jm-improve-tls-secret
Improve TLS secret configuration
2017-03-26 17:54:24 -03:00
Manuel Alejandro de Brito Fontes
90e0ca410c Merge pull request #503 from aledbf/aws-example
Add example for nginx in aws
2017-03-26 17:48:04 -03:00
Manuel de Brito Fontes
b33bcd9ba0 Add example for nginx in aws 2017-03-26 17:47:26 -03:00
Manuel Alejandro de Brito Fontes
e5fdc3676b Merge pull request #502 from aledbf/ssl-passthrough-warning
Add information about SSL Passthrough annotation
2017-03-26 17:26:10 -03:00
Manuel de Brito Fontes
40f9064ca3 Add information about SSL Passthrough annotation 2017-03-26 17:25:05 -03:00
Joao Morais
567041ea0d Improve TLS secret configuration 2017-03-26 09:28:59 -03:00
Manuel Alejandro de Brito Fontes
f5211458ce Merge pull request #454 from danielqsj/master
Pass request port to real server
2017-03-26 08:01:11 -03:00
Manuel Alejandro de Brito Fontes
dfccb44167 Merge pull request #488 from canhnt/master
Adds support for CORS on error responses and Authorization header
2017-03-26 08:00:34 -03:00
Manuel Alejandro de Brito Fontes
b7367a98b6 Merge pull request #498 from jcmoraisjr/jm-fix-enqueue-secret
Proper enqueue a secret on the secret queue
2017-03-26 07:57:24 -03:00
Joao Morais
f945624e9c Proper enqueue a secret on the secret queue 2017-03-25 21:10:20 -03:00
rsafronov
6d07d32003 Merge branch 'upstream' into nginx/extauth_headers 2017-03-24 20:25:18 -04:00
Manuel Alejandro de Brito Fontes
e8b61b40d9 Merge pull request #490 from chentao1596/name_port_unittest
Add unit test case for named_port
2017-03-24 07:25:52 -03:00
chentao1596
740f7caeb8 add unit test case for named_port 2017-03-24 14:18:17 +08:00
chentao1596
9f5ed978b9 use interface instead of implementation 2017-03-24 10:20:44 +08:00
Canh Ngo
46a42a2905 Adds support for CORS with Authorization header 2017-03-23 16:17:47 +01:00
Canh Ngo
df76382055 Adds support for CORS on error responses 2017-03-23 16:17:37 +01:00
Nick Sardo
116fbe8c33 Merge pull request #477 from nicksardo/glbc-service-watch
[GLBC] Sync ingress when default backend service is modified.
2017-03-22 13:08:30 -07:00
Nick Sardo
a94d31e87d glbc: watch backend service 2017-03-22 13:07:37 -07:00
Nick Sardo
0a75f42884 Merge pull request #479 from matthewg/master
Add 35.191.0.0/16 range to GCE firewalls
2017-03-22 10:22:46 -07:00
Manuel Alejandro de Brito Fontes
8c7f3ab8e6 Merge pull request #481 from tsupertramp/fix-nginx-log-format
Remove unnecessary quote in nginx log format
2017-03-22 13:18:35 -03:00
Manuel Alejandro de Brito Fontes
2a9ac83056 Merge pull request #485 from cy-play/fix-typos-custom-vts-metrics
Fix typo nginx configMap vts metrics customization
2017-03-22 13:17:38 -03:00
mrmm
031fdfd730 Fix typo nginx configMap vts metrics customization 2017-03-22 15:12:52 +00:00
Thomas Peitz
3b55e09e23 Remove unnecessary quote in nginx log format 2017-03-22 15:48:15 +01:00
Matthew Sachs
04b87d5945 Add 35.191.0.0/16 range to GCE firewalls (issue #478) 2017-03-22 00:18:26 -07:00
Manuel Alejandro de Brito Fontes
fc5da49617 Merge pull request #474 from zouyee/master
add custom vts metrics example
2017-03-21 23:10:51 -03:00
zoues
5446208d5f Update README.md 2017-03-22 09:38:21 +08:00
Nick Sardo
509aaf10c6 Merge pull request #472 from nicksardo/git-ignore-glbc
[gce] Add .gitignore
2017-03-21 12:43:19 -07:00
zoues
be05d403ac fix vts readme 2017-03-21 23:35:43 +08:00
zoues
1f1829f42b add custom vts metrics example 2017-03-21 23:29:57 +08:00
shijunqian
43469a8179 Pass request port to real server 2017-03-21 10:33:11 +08:00
Manuel Alejandro de Brito Fontes
1739327ec3 Merge pull request #471 from dannyk81/nginx/prometheus-scrape-annotations
[Nginx] prometheus scrape annotations
2017-03-20 21:48:09 -03:00
Danny Kulchinsky
6a38a1ac37 Adding Prometheus metrics scrape annotations
Allow Prometheus automatic discovery of nginx metrics endpoint

Fixed https://github.com/kubernetes/ingress/issues/464
2017-03-20 20:17:07 -04:00
Nick Sardo
3706f32639 git ignore glbc 2017-03-20 16:36:18 -07:00