Commit graph

897 commits

Author SHA1 Message Date
Manuel Alejandro de Brito Fontes
de8b9b8df2 Merge pull request #370 from foxylion/force-ssl-redirect-documentation
Add documentation for ingress.kubernetes.io/force-ssl-redirect
2017-03-05 22:11:05 -03:00
Manuel Alejandro de Brito Fontes
247d017d60 Merge pull request #375 from jcmoraisjr/jm-haproxy-auth-basic
HAProxy Auth Basic sample
2017-03-05 22:10:31 -03:00
Joao Morais
73c9197df6 HAProxy Auth Basic sample 2017-03-05 21:41:12 -03:00
Manuel Alejandro de Brito Fontes
84acaec58e Merge pull request #373 from aledbf/log-format
Cleanup
2017-03-04 19:04:46 -03:00
Manuel de Brito Fontes
cd924f5522 Avoid duplication of ReadConfig function 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
1473f64fb0 Remove SPDY reference 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
3c0fb01ba2 Add warning when the ingress controller uses a custom class 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
2399be867e Cleanup custom log format configuration 2017-03-04 18:35:33 -03:00
Jakob Jarosch
74d57c9502 Add documentation for ingress.kubernetes.io/force-ssl-redirect
refs #314 #365
2017-03-03 20:29:43 +01:00
Peter Lee
0b6f4d2770 Minor text fix for "ApiServer"
It looks a little weird to apply camel case style for the noun "apiserver", i didn't see somewhere else spelling it in that way.
2017-03-04 00:40:07 +08:00
Manuel Alejandro de Brito Fontes
75124bc9f1 Merge pull request #356 from gianrubio/patch-1
Disable listen only on ipv6 and fix proxy_protocol
2017-03-03 09:50:43 -03:00
Manuel Alejandro de Brito Fontes
6cd21f7dea Merge pull request #362 from gianrubio/fix-ingress-class
Fix ingress class
2017-03-03 09:49:59 -03:00
Manuel Alejandro de Brito Fontes
3b2f668f39 Merge pull request #367 from gianrubio/customize-logformat
BuildLogFormatUpstream was always using the default log-format
2017-03-03 09:43:48 -03:00
Manuel Alejandro de Brito Fontes
9f39abc019 Merge pull request #365 from pwillie/forcesslredirect
add ForceSSLRedirect ingress annotation
2017-03-03 09:05:02 -03:00
Giancarlo Rubio
1e5081baf2 BuildLogFormatUpstream function was always using the default log-format-upstream, 2017-03-03 13:03:49 +01:00
Manuel Alejandro de Brito Fontes
ecb21a63a2 Merge pull request #366 from caiyixiang/add_judgment
add_judgment
2017-03-03 09:02:32 -03:00
caiyixiang
482293b99d add_judgment 2017-03-03 15:17:32 +08:00
Peter Wilson
1a72b3f775 add ForceSSLRedirect ingress annotation 2017-03-03 16:44:29 +11: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
rsafronov
d5ede33f88 test fix 2017-03-02 15:48:36 -05:00
rsafronov
05526e4a66 Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers
# Conflicts:
#	controllers/nginx/pkg/template/template.go
2017-03-02 14:46:18 -05:00
Christian Bell
68097e96dc Better logging and address review comments 2017-03-02 10:54:32 -08:00
Giancarlo Rubio
2ddba72baa Fix ingress class 2017-03-02 16:50:31 +01: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
Giancarlo Rubio
90fdea751b Disable listen only on ipv6 and fix proxy_protocol
- Always listen on ipv4 address for port 443
- Rollback previous PR #227 that broke the proxy_protocol when passthroughBackends is disabled
2017-03-01 15:31:00 +01:00
Christian Bell
b259c9b349 First stab at extending the "uid" configmap to store firewall
rule information.
2017-02-28 10:49:31 -08:00
rsafronov
d3b952552a minor: formatting 2017-02-27 16:34:42 -05:00
electroma
c8eda8f17f Merge branch 'master' into nginx/extauth_headers 2017-02-27 16:28:11 -05: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