Commit graph

3268 commits

Author SHA1 Message Date
k8s-ci-robot
43b47304e3
Merge pull request #3175 from yanc0/fix-server-snippet-annotation-doc
Fix yaml indentation in annotations server-snippet doc
2018-10-03 11:18:27 -07: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
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
k8s-ci-robot
9146cfb67f
Merge pull request #3162 from ms4720/ms4720-patch-1
update name of config map in README.md
2018-09-30 05:54:27 -07:00
Marc Spitzer
751d76c7eb
update name of config map 2018-09-30 10:51:42 +08:00
k8s-ci-robot
0f56609692
Merge pull request #3159 from kirs/fix-dev-env.sh
Pass --shell to minikube docker-env
2018-09-29 14:43:34 -07:00
Kir Shatrov
b2407bcc6b Pass --shell to minikube docker-env 2018-09-29 21:32:05 +01:00
Manuel Alejandro de Brito Fontes
d1750ed37e
Update default backend image (#3146) 2018-09-29 11:36:02 -03:00
k8s-ci-robot
89de34dc5b
Merge pull request #3151 from diazjf/cipher-e2e
Add e2e test for SSL-Ciphers
2018-09-27 12:51:20 -07:00
Fernando Diaz
75975d74fb Add e2e test for SSL-Ciphers
Adds tests to make sure SSL-Ciphers are configurable via annotation
2018-09-27 14:23:02 -05:00
Manuel Alejandro de Brito Fontes
e363226bc9
Fix error publishing docs [skip ci] (#3147) 2018-09-26 22:09:46 -03:00
k8s-ci-robot
50bb7897cf
Merge pull request #3125 from jonpulsifer/change-default-backend-metrics-port
[404-server] Conceal /metrics and /healthz behind port 10254
2018-09-26 14:38:17 -07:00
Jonathan Pulsifer
d487a50e39
[404-server] conceal /metrics behind port 10254
This commit conceals the /metrics endpoint behind port 10254.

Thanks to @aledbf for all the help getting this through!

Signed-off-by: Jonathan Pulsifer <jonathan.pulsifer@shopify.com>
2018-09-26 16:02:18 -04:00
Markus Padourek
bf4be49c02 Fix incorrect .DisableLua access. (#3144)
* Fix incorrect .DisableLua access.

* Address comment.
2018-09-26 14:05:05 -03:00
Zenara Daley
a7c2633e4e remove payload from log (#3135) 2018-09-26 12:09:14 -03:00
k8s-ci-robot
5ba5ddf062
Merge pull request #3143 from Globegitter/patch-2
Ensure monitoring for custom error pages
2018-09-26 07:59:30 -07:00
Globegitter
a2ccd1f224 Fix usage for $all. 2018-09-26 16:38:16 +02:00
Markus Padourek
fe219db231
Ensure monitoring for custom error pages
Fixes #3140
2018-09-26 16:26:38 +02:00
Manuel Alejandro de Brito Fontes
f56e839134
Fix deployments until next release (#3142) 2018-09-26 10:15:57 -03:00
k8s-ci-robot
c3ce6b892e
Merge pull request #3126 from ElvinEfendi/optional-default-backend-service
do not require --default-backend-service
2018-09-26 02:53:08 -07:00
Elvin Efendi
14815c546c update docs 2018-09-25 21:49:37 -04:00
Elvin Efendi
b3a22f7fc0 do not require --default-backend-service 2018-09-25 21:14:28 -04:00
k8s-ci-robot
5ce3809457
Merge pull request #3137 from aledbf/docker-user
Docker run as user
2018-09-25 17:17:17 -07:00
Manuel Alejandro de Brito Fontes
1e72774609 Docker run as user 2018-09-25 20:42:26 -03:00
k8s-ci-robot
c677002322
Merge pull request #3136 from aledbf/update-nginx
Update nginx image
2018-09-25 15:06:11 -07:00
Manuel Alejandro de Brito Fontes
3f29e436f3 Update nginx image 2018-09-25 18:35:01 -03:00
k8s-ci-robot
471049bd5b
Merge pull request #3134 from aledbf/master
Update nginx to 1.15.4
2018-09-25 13:35:57 -07:00
Manuel Alejandro de Brito Fontes
9096822895
Update nginx to 1.15.4 2018-09-25 16:48:16 -03:00
k8s-ci-robot
697d876858
Merge pull request #3133 from maximbr/patch-1
multi-tls readme example to reference the file
2018-09-25 11:57:29 -07: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
k8s-ci-robot
c4a562dded
Merge pull request #3130 from alanbover/fix/newlines_location_denied
fix newlines location denied
2018-09-25 07:04:50 -07:00
Alan Bover
6454608c6c fix newlines location denied 2018-09-25 15:36:23 +02:00
k8s-ci-robot
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
Pavel Sinkevych
7212d0081b Provide possibility to block CIDRs, User-Agents and Referers globally 2018-09-25 14:16:20 +03:00
k8s-ci-robot
68357f8e67
Merge pull request #3118 from aledbf/ref-json
Replace standard json encoding with jsoniter
2018-09-25 00:41:26 -07:00
k8s-ci-robot
ab11a8da56
Merge pull request #3121 from mirake/fix-typos
Typo fix: adresses -> addresses
2018-09-24 08:19:56 -07:00
Rui Cao
0853a9f4f5 Typo fix: adresses -> addresses
Signed-off-by: Rui Cao <ruicao@alauda.io>
2018-09-24 22:51:16 +08:00
Manuel de Brito Fontes
5cca38304e Fix tests 2018-09-22 15:09:54 -03:00
Manuel de Brito Fontes
2882fb5ebe Update go dependencies 2018-09-22 14:54:24 -03:00
Manuel de Brito Fontes
55ccaf4be3 Update prometheus methods 2018-09-22 14:54:11 -03:00
Manuel de Brito Fontes
9766ad8f4b Filter hostnames before creation of metrics 2018-09-22 14:25:57 -03:00
Manuel de Brito Fontes
91ae204f6c Replace standard json encoding with jsoniter 2018-09-22 14:25:01 -03:00
k8s-ci-robot
0fd87a7e56
Merge pull request #3115 from eutopian/master
Fixed link to aws elastic loadbalancer
2018-09-20 14:03:55 -07:00
eutopian
7867615a2b cla bump 2018-09-20 16:03:43 -04:00
eutopian
797affbe48 Fixed link to aws elb 2018-09-20 15:39:08 -04:00
k8s-ci-robot
37b210979e
Merge pull request #3111 from hchenxa/hchenxa_monitor
doc issue related to monitor part
2018-09-20 05:32:20 -07:00
Hui Chen
be87141fe7 doc issue related to monitor part 2018-09-20 17:34:07 +08:00
k8s-ci-robot
42912df042
Merge pull request #3113 from stepyu/master
fix typos
2018-09-20 02:16:18 -07:00
stepyu
1d0e752339 fix typos 2018-09-21 16:19:16 +08:00