Commit graph

3731 commits

Author SHA1 Message Date
David Dooling
83050fe3df Add standard labels to namespace specs
Add standard app resource metadata labels to the namespaces specs
created when deploying nginx-ingress.

Closes kubernetes/ingress-nginx#3576
2018-12-18 16:38:42 -06:00
Kubernetes Prow Robot
281cba6749
Merge pull request #3573 from diazjf/doc-update
Update Certificate Generation Docs to not use MD5
2018-12-18 12:12:07 -08:00
Kubernetes Prow Robot
1b06cf7ed2
Merge pull request #3566 from diazjf/unit-locs
Add Unit Tests for getIngressInformation
2018-12-18 10:04:55 -08:00
Zenara Daley
e4459940fa add documentation 2018-12-18 12:53:54 -05:00
Fernando Diaz
85ab6bf26d Update Certificate Generation Docs to not use MD5
Updates the TLS and CA certificate sections to use algorithms
better than md5. Using md5 as a digest causes nginx to fail
to load because it is not accepted by open ssl.

Closes #3571
2018-12-18 11:17:06 -06:00
Fernando Diaz
429110aa13 Add Unit Tests for getIngressInformation
Adds a unit test for the getIngressInformation
function.
2018-12-18 11:10:48 -06:00
Kubernetes Prow Robot
c6629accf9
Merge pull request #3569 from Shopify/fix-status-updater
fix status updated: make sure ingress.status is copied
2018-12-17 09:26:55 -08:00
Elvin Efendi
7a00d52141 fix status updated: make sure ingress.status is copied 2018-12-17 16:19:02 +04:00
Kubernetes Prow Robot
ee3a8fe581
Merge pull request #3505 from Shopify/watch-pod-lua
Update lua configuration_data when number of controller pod change
2018-12-17 00:10:30 -08:00
Maxime Ginters
f90881b367 Update lua configuration_data when number of controller pod change 2018-12-14 13:34:54 -05:00
Kubernetes Prow Robot
921763c182
Merge pull request #3562 from gonzalesraul/patch-1
Rename nginx.yaml to nginx.json
2018-12-14 09:40:12 -08:00
Raul Gonzales
9694ab6121
Rename nginx.yaml to nginx.json 2018-12-14 11:39:12 +00:00
Zenara Daley
67654a6fd5 Generalize Rewrite Block Creation 2018-12-13 13:02:05 -05:00
Kubernetes Prow Robot
ed5410df38
Merge pull request #3551 from Shopify/nested-wildcart-certificate
Fix --enable-dynamic-certificates for nested subdomain
2018-12-12 07:33:27 -08:00
Maxime Ginters
ff8bfb6a86 Fix --enable-dynamic-certificates for nested subdomain 2018-12-12 09:16:39 -05:00
Kubernetes Prow Robot
02e6424b32
Merge pull request #3553 from zhuguihua/handle_error_when_executing_diff
handle_error_when_executing_diff
2018-12-12 04:58:21 -08:00
Guihua Zhu
d22146f3b0 handle_error_when_executing_diff
Signed-off-by: Guihua Zhu <zhuguihua@cmss.chinamobile.com>
2018-12-12 13:49:17 +08:00
Stefan Breunig
571bcfc433 e2e test to ensure graceful shutdown does not lose requests (see #3533 #3536) 2018-12-11 11:37:19 +01:00
Kubernetes Prow Robot
19b3b6be0c
Merge pull request #3503 from zhuguihua/compare_error_with_error_types_from_apimachinery
compare error with error types from k8s.io/apimachinery/pkg/api/errors
2018-12-11 00:41:42 -08:00
Kubernetes Prow Robot
8ae01a2cf9
Merge pull request #3525 from Shopify/order_independence_canary_ann
make canary ingresses independent of the order they were applied
2018-12-10 11:14:55 -08:00
Conor Landry
d5840a4071 make canary ingresses independent of the order they were applied 2018-12-10 13:17:05 -05:00
Kubernetes Prow Robot
55b4f00368
Merge pull request #3536 from aledbf/replace-entrypoint
Replace dockerfile entrypoint
2018-12-10 06:42:00 -08:00
Manuel Alejandro de Brito Fontes
41700044ad Replace dockerfile entrypoint 2018-12-07 14:00:55 -03:00
Kubernetes Prow Robot
f6f18a167d
Merge pull request #3532 from ArchangelSDY/ingress-update
Ignore updates of ingresses with invalid class
2018-12-07 04:28:14 -08:00
Guihua Zhu
bb41a9d56f compare error with error types from k8s.io/apimachinery/pkg/api/errors
Signed-off-by: Guihua Zhu <zhuguihua@cmss.chinamobile.com>
2018-12-07 15:42:52 +08:00
Manuel Alejandro de Brito Fontes
ea89d27b5d
Update nginx image (#3530) 2018-12-06 15:59:14 -03:00
Kubernetes Prow Robot
58057a2d25
Merge pull request #3521 from Shopify/fix-canary-server
Fix a bug with Canary becoming main server
2018-12-06 08:54:06 -08:00
Maxime Ginters
af460f7e15 Fix a bug with Canary becoming main server 2018-12-06 11:04:32 -05:00
Archangel_SDY
ece5e1c678 Pass k8sStore to member functions by pointer
Passing `k8sStore` by value implies read and copy of `backendConfig`,
which is not protected by a mutex and may cause race conditions.
2018-12-06 22:11:19 +08:00
Archangel_SDY
d58dbde5e3 Add a mutex to protect against simultaneous read/write to backend config
This addresses issues found by race detector.
2018-12-06 22:02:17 +08:00
Archangel_SDY
9122c08b3e Ignore updates of ingress with invalid class 2018-12-06 22:02:17 +08:00
Kubernetes Prow Robot
cc2b54472a
Merge pull request #3508 from aledbf/update-ngx
Update nginx to 1.15.7
2018-12-06 04:49:14 -08:00
Kubernetes Prow Robot
83196881a8
Merge pull request #3518 from gaozhenhai/master
Fix log output format
2018-12-06 03:41:53 -08:00
Kubernetes Prow Robot
da32401c66
Merge pull request #3509 from fabiant7t/master
[1759] Ingress affinity session cookie with Secure flag for HTTPS
2018-12-06 01:18:24 -08:00
Fabian Topfstedt
f03c8a8544 testing that a secure cookie gets set when being in ssl mode
Signed-off-by: Fabian Topfstedt <topfstedt@schneevonmorgen.com>
2018-12-06 09:08:25 +01:00
Fabian Topfstedt
6c46adf2b7 reverted changing $https globally in the unit tests
Signed-off-by: Fabian Topfstedt <topfstedt@schneevonmorgen.com>
2018-12-06 09:01:08 +01:00
Zhenhai Gao
05d2baede6 Fix log output format
Signed-off-by: Zhenhai Gao <gaozh1988@live.com>
2018-12-06 09:59:31 +08:00
Kubernetes Prow Robot
f5d2fa19aa
Merge pull request #3522 from jmervine/patch-1
{tcp,udp}-services cm appear twice
2018-12-05 12:29:35 -08:00
Joshua Mervine
5de991bb5b
{tcp,udp}-services cm appear twice 2018-12-05 09:15:51 -08:00
Kubernetes Prow Robot
be3ff42858
Merge pull request #3498 from aledbf/update-godeps
Update godeps
2018-12-05 09:07:08 -08:00
Manuel Alejandro de Brito Fontes
68f344233b Fix lint issues 2018-12-05 13:28:28 -03:00
Manuel Alejandro de Brito Fontes
1fed943b3d Update process-exporter methods 2018-12-05 13:28:10 -03:00
Manuel Alejandro de Brito Fontes
2fa55eabf6 Replace glog with klog 2018-12-05 13:27:55 -03:00
Manuel Alejandro de Brito Fontes
f4a4daed84 Update go dependencies 2018-12-05 13:27:09 -03:00
Kubernetes Prow Robot
432f534383
Merge pull request #3512 from aledbf/disable-metrics
Allow to disable NGINX metrics
2018-12-05 08:16:12 -08:00
Manuel Alejandro de Brito Fontes
06d33c16b5
Allow to disable NGINX metrics 2018-12-05 10:14:35 -03:00
Kubernetes Prow Robot
c4ba23832a
Merge pull request #3474 from aledbf/improve-parsing
Improve parsing of annotations and use of Ingress wrapper
2018-12-05 03:33:18 -08:00
Manuel Alejandro de Brito Fontes
06d53f0260
Fix error in configmap yaml definition (#3516) 2018-12-04 20:06:14 -03:00
Kubernetes Prow Robot
abab0db32b
Merge pull request #3513 from dmxlsj/revert_tcp_udp
Revert removal of TCP and UDP support configmaps in mandatroy manifest
2018-12-04 14:16:44 -08:00
Sungmin Lee
5febf3e8ea Revert removal of TCP and UDP support configmaps in mandatroy manifest 2018-12-04 13:13:09 -08:00