Commit graph

669 commits

Author SHA1 Message Date
caiyixiang
482293b99d add_judgment 2017-03-03 15:17:32 +08:00
Manuel Alejandro de Brito Fontes
0b48d3b24d Merge pull request #354 from caiyixiang/addJudgment
add judgment
2017-03-03 01:03:58 -03:00
caiyixiang
248f6ade75 add judgment 2017-03-03 08:39:18 +08:00
Manuel Alejandro de Brito Fontes
1822537fc6 Merge pull request #364 from whereisaaron/patch-1
Fix error caused by increasing proxy_buffer_size (#363)
2017-03-02 18:48:19 -03:00
Aaron Roydhouse
336f3cb108 Fix error caused by increasing proxy_buffer_size (#363)
This fixes the bug raised in #363, by increasing the size of the proxy_buffers (memory allocation) to match the size of the proxy buffer. This leaves the default values (with no ingress setting) unchanged:
```
proxy_buffer_size      4k
proxy_buffers            4 4k
```
If 'proxy-buffer-size' is set, then now both the buffer size and the memory allocation size is increased:
```
proxy_buffer_size     "{{ $location.Proxy.BufferSize }}";
proxy_buffers           4 "{{ $location.Proxy.BufferSize }}";
```
I have been using this patch with 0.8.3 and 0.9.0-beta.2.
2017-03-02 16:11:27 -05:00
Manuel Alejandro de Brito Fontes
f5f9f5e9c8 Merge pull request #361 from caiyixiang/haproxyDaemonset
haproxy Daemonset
2017-03-02 09:05:03 -03:00
caiyixiang
e33e6a8162 haproxy Daemonset 2017-03-02 16:49:55 +08:00
Manuel Alejandro de Brito Fontes
3fdb1a842b Merge pull request #358 from rikatz/issue-242
Checks if the TLS secret contains a valid keypair structure
2017-03-01 23:56:23 -03:00
Manuel Alejandro de Brito Fontes
292656039c Merge pull request #360 from chentao1596/multi-deployment
add example of 'run multiple nginx ingress controllers as a deployment'
2017-03-01 23:55:48 -03:00
chentao1596
c25b455e9d add example of 'run multiple nginx ingress controllers as a deployment' 2017-03-02 09:33:01 +08:00
Manuel Alejandro de Brito Fontes
b1ba356218 Merge pull request #352 from gianrubio/customize-logformat
Add ability to customize upstream and stream log format
2017-03-01 15:54:14 -03:00
Ricardo Pchevuzinske Katz
02fbf00fcb Checks if the TLS secret contains a valid keypair structure, with 'CERTIFICATE' before the Private Key 2017-03-01 15:44:39 -03:00
Giancarlo Rubio
0ca3aef0f5 Add ability to customize upstream and stream log format 2017-03-01 18:47:11 +01:00
Manuel Alejandro de Brito Fontes
fb8e2d7373 Merge pull request #351 from danielqsj/master
Enable custom election id for status sync.
2017-02-27 09:19:15 -03:00
shijunqian
2d526b213c Enable custom election id for status sync. 2017-02-27 15:35:04 +08:00
Manuel Alejandro de Brito Fontes
376519ef52 Merge pull request #347 from aledbf/fix-proxy-protocol
Fix client source IP address
2017-02-26 19:24:46 -03:00
Manuel de Brito Fontes
02d44ccbaa Fix client source IP address 2017-02-26 19:01:07 -03:00
Manuel Alejandro de Brito Fontes
0aabfba848 Merge pull request #235 from rikatz/ingress-ssl-auth
Adds correct support for TLS Muthual autentication
2017-02-25 20:34:28 -03:00
Manuel Alejandro de Brito Fontes
77395e07f8 Merge pull request #346 from piosz/metrics
Expose Prometheus metrics in glbc controller
2017-02-25 17:07:44 -03:00
Piotr Szczesniak
fd7990de67 Expose Prometheus metrics in glbc controller 2017-02-25 18:30:00 +01:00
Manuel Alejandro de Brito Fontes
8f23451c24 Merge pull request #221 from tonglil/typos
Typo: unittesting -> unit testing
2017-02-25 08:12:53 -03:00
Manuel Alejandro de Brito Fontes
712b60f197 Merge pull request #222 from tonglil/fix-log-message
Change arg ordering in log message
2017-02-25 08:12:41 -03:00
Manuel Alejandro de Brito Fontes
3f2592128c Merge pull request #224 from tonglil/check-error
Check for error getting cert
2017-02-25 08:12:25 -03:00
Ricardo Pchevuzinske Katz
a342c0bce3 Adds correct support for TLS Muthual autentication and depth verification
modified:   controllers/nginx/configuration.md
	modified:   controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
	modified:   core/pkg/ingress/annotations/authtls/main.go
	modified:   core/pkg/ingress/controller/backend_ssl.go
	modified:   core/pkg/ingress/controller/controller.go
	modified:   core/pkg/ingress/controller/util_test.go
	modified:   core/pkg/ingress/resolver/main.go
	modified:   core/pkg/ingress/types.go
	modified:   core/pkg/net/ssl/ssl.go
	modified:   examples/PREREQUISITES.md
	new file:   examples/auth/client-certs/nginx/README.md
	new file:   examples/auth/client-certs/nginx/nginx-tls-auth.yaml
2017-02-24 22:49:01 -03:00
Manuel Alejandro de Brito Fontes
f5e005f84f Merge pull request #345 from aledbf/fmt
Fix lint error
2017-02-24 22:16:13 -03:00
Manuel de Brito Fontes
a44130f7f5 Fix lint error 2017-02-24 21:54:47 -03:00
Manuel Alejandro de Brito Fontes
ff3674fcc6 Merge pull request #320 from chentao1596/fix-test-http-service
update some descriptions about of 'Test HTTP Service'
2017-02-24 20:59:56 -03:00
Manuel Alejandro de Brito Fontes
f509d5b44f Merge pull request #344 from aledbf/tcp-udp
Refactoring of TCP and UDP services
2017-02-24 20:48:13 -03:00
Manuel de Brito Fontes
84324af140 Refactoring of TCP and UDP services 2017-02-24 20:14:43 -03:00
Manuel Alejandro de Brito Fontes
33ab550290 Merge pull request #332 from aledbf/snippets
Add annotation to customize nginx configuration
2017-02-24 18:39:45 -03:00
Manuel Alejandro de Brito Fontes
8b7d9d1872 Merge pull request #343 from aledbf/node-lister
Fix node lister when --watch-namespace is used
2017-02-24 15:12:01 -03:00
Manuel de Brito Fontes
c6dd2db550 Fix node lister when --watch-namespace is used 2017-02-24 14:18:10 -03:00
Manuel Alejandro de Brito Fontes
0134715b1c Merge pull request #341 from porridge/drop-cover
Do not run coverage check in the default target.
2017-02-24 13:09:53 -03:00
Manuel Alejandro de Brito Fontes
63630d8f12 Merge pull request #340 from gianrubio/custom-proxy-cookies
Add support for specify proxy cookie path/domain
2017-02-24 13:02:40 -03:00
Marcin Owsiany
2e302de264 Do not run coverage check in the default target.
Reasons:
- this takes a lot longer than the other steps
- its results are harder to interpret at a single glance, compared to other
  steps
- it requires special privileges to succeed, and should probably not be ran
  from a random developer's checkout, since it pushes results to a shared
  service
2017-02-24 16:50:10 +01:00
Giancarlo Rubio
704a18cec9 Add support for proxy cookie path/proxy cookie domain 2017-02-24 16:06:30 +01:00
Manuel Alejandro de Brito Fontes
96b1158a5b Merge pull request #337 from porridge/fix-fmt
Fix for formatting error introduced in #304.
2017-02-24 10:04:10 -03:00
Manuel Alejandro de Brito Fontes
7cc5ef93d6 Merge pull request #336 from porridge/silence-vet
Fix for vet complaints: #335.
2017-02-24 09:17:57 -03:00
Marcin Owsiany
192c551abb Fix for formatting error introduced in #304.
Why don't we fail the travis build when go fmt is unhappy?
2017-02-24 12:05:31 +01:00
Marcin Owsiany
5159afad2a Fix for vet complaints: #335. 2017-02-24 11:56:31 +01:00
Manuel de Brito Fontes
a20c287614 Add annotation to customize nginx location configuration 2017-02-23 16:48:59 -03:00
Manuel Alejandro de Brito Fontes
85369f87cf Merge pull request #331 from jgeraerts/patch-1
Correct spelling mistake
2017-02-23 16:05:19 -03:00
Jo Geraerts
63573b3958 Correct spelling mistake 2017-02-23 16:52:10 +01:00
Manuel Alejandro de Brito Fontes
852b598c02 Merge pull request #328 from fate-grand-order/patch-1
fix misspell "affinity" in main.go
2017-02-23 11:20:16 -03:00
fate-grand-order
3d0e374f9e fix misspell "affinity" in main.go 2017-02-23 21:59:09 +08:00
Manuel Alejandro de Brito Fontes
964aa0a15a Merge pull request #295 from tangle329/master
We need check content, when cmd failed.
2017-02-23 00:28:13 -03:00
Manuel Alejandro de Brito Fontes
298925527d Merge pull request #326 from chentao1596/daemonset
add nginx daemonset example
2017-02-22 23:56:24 -03:00
Manuel Alejandro de Brito Fontes
4fcfec0c7d Merge pull request #317 from aledbf/custom-controller
Add missing method in custom-controller
2017-02-22 23:51:20 -03:00
chentao1596
e5f6a31a91 add nginx daemonst example 2017-02-23 10:17:34 +08:00
Manuel Alejandro de Brito Fontes
592814bf97 Merge pull request #303 from aledbf/release-beta-2
Release 0.9.0-beta.2
2017-02-22 15:02:15 -03:00