Commit graph

3883 commits

Author SHA1 Message Date
Manuel Alejandro de Brito Fontes
1186d88f08
Fix name of field used to sort ingresses (#3871) 2019-03-07 21:24:46 -03:00
Kubernetes Prow Robot
ef0b1633e2
Merge pull request #3856 from aledbf/master
Fix ssl-dh-param issue when secret does not exit
2019-03-05 18:04:02 -08:00
Manuel Alejandro de Brito Fontes
d898169484 Fix ssl-dh-param issue when secret does not exit 2019-03-05 16:31:33 -03:00
Kubernetes Prow Robot
b1c2812dc5
Merge pull request #3849 from trnl/master
Use Gauge instead of Counter for connections_active Prometheus metric
2019-03-05 03:09:00 -08:00
Kubernetes Prow Robot
7a0ca9c597
Merge pull request #3847 from tjamet/fix-basic-doc
Add missing basic usage documentation link
2019-03-04 13:48:23 -08:00
Kubernetes Prow Robot
c6f4ffd686
Merge pull request #3846 from tjamet/test-race-condition
Fix race condition in metric process collector test
2019-03-04 13:44:43 -08:00
Uladzimir Mihura
13d0f0ddab Use Gauge instead of Counter for connections_active Prometheus metric 2019-03-04 22:35:45 +01:00
Thibault Jamet
a08ca38ac0
Fix missing basic usage documentation link
fix `make live-docs` reporting

```
INFO    -  The following pages exist in the docs directory, but are not
included in the "nav" configuration:
  - user-guide/basic-usage.md
```

Change-Id: Iafd4d49b063ffb676cc303135495283a125b5297
2019-03-04 22:00:28 +01:00
Thibault Jamet
27a98f2920
Fix race condition in metric process collector test
There was a goroutine started to log things upon a test that could be
ended at the time `cmd.Wait()` ends.

To solve the problem, when the sub-test ends, ensure we wait until the
command ends when ending the test

The output of `make test` before the fix shows:

```
=== RUN   TestNewUDPLogListener
==================
WARNING: DATA RACE
Read at 0x00c0002a8643 by goroutine 74:
  testing.(*common).logDepth()
      /usr/local/go/src/testing/testing.go:629 +0x132
  testing.(*common).Logf()
      /usr/local/go/src/testing/testing.go:614 +0x90
  k8s.io/ingress-nginx/internal/ingress/metric/collectors.TestProcessCollector.func1.1()
      /go/src/k8s.io/ingress-nginx/internal/ingress/metric/collectors/process_test.go:54 +0x140

Previous write at 0x00c0002a8643 by goroutine 72:
  testing.tRunner.func1()
      /usr/local/go/src/testing/testing.go:856 +0x33e
  testing.tRunner()
      /usr/local/go/src/testing/testing.go:869 +0x17f

Goroutine 74 (running) created at:
  k8s.io/ingress-nginx/internal/ingress/metric/collectors.TestProcessCollector.func1()
      /go/src/k8s.io/ingress-nginx/internal/ingress/metric/collectors/process_test.go:50 +0x218
  testing.tRunner()
      /usr/local/go/src/testing/testing.go:865 +0x163

Goroutine 72 (finished) created at:
  testing.(*T).Run()
      /usr/local/go/src/testing/testing.go:916 +0x699
  testing.runTests.func1()
      /usr/local/go/src/testing/testing.go:1157 +0xa8
  testing.tRunner()
      /usr/local/go/src/testing/testing.go:865 +0x163
  testing.runTests()
      /usr/local/go/src/testing/testing.go:1155 +0x523
  testing.(*M).Run()
      /usr/local/go/src/testing/testing.go:1072 +0x2eb
  main.main()
      _testmain.go:52 +0x222
==================
--- PASS: TestNewUDPLogListener (0.00s)
```

after the patch:

```
=== RUN   TestNewUDPLogListener
--- PASS: TestNewUDPLogListener (0.01s)
```

Change-Id: I8ea246d14f5f80b330be19dd5b8299c6762f6d6b
2019-03-04 21:54:42 +01:00
Kubernetes Prow Robot
213b8c8267
Merge pull request #3743 from Shopify/remove-session-cookie-hash
Remove session-cookie-hash annotation
2019-03-04 10:56:15 -08:00
Alex Kursell
d3ac73be79 Remove session-cookie-hash annotation 2019-03-04 10:34:48 -05:00
Kubernetes Prow Robot
79c52cf094
Merge pull request #3829 from Shopify/protect-e2e-test
Prevent e2e-tests from running on non-local clusters
2019-03-02 11:37:48 -08:00
Manuel Alejandro de Brito Fontes
706b62a41c
Update mkdocs [skip ci] (#3836) 2019-03-02 15:02:31 -03:00
Kubernetes Prow Robot
817c1bf760
Merge pull request #3835 from aledbf/update-nginx
Update nginx image
2019-03-01 05:03:25 -08:00
Manuel Alejandro de Brito Fontes
fbed06fd3c
Update nginx image 2019-03-01 09:18:45 -03:00
Kubernetes Prow Robot
e48e9c1c77
Merge pull request #3833 from ElvinEfendi/bump-luajit
bump luajit version to v2.1-20190228
2019-03-01 03:16:37 -08:00
Elvin Efendi
584750454f bump luajit version to v2.1-20190228 that has fix for https://github.com/openresty/luajit2/issues/42 2019-02-28 21:16:49 -05:00
Alex Kursell
047aeb5c29 Prevent e2e-tests from running on non-local clusters 2019-02-28 10:54:43 -05:00
Kubernetes Prow Robot
de2f760e41
Merge pull request #3827 from Shopify/fix-plugin-install-docs
Fix plugin install location
2019-02-27 12:40:15 -08:00
Alex Kursell
d4b14b40ff Use incantation from release page 2019-02-27 12:57:55 -05:00
Kubernetes Prow Robot
be1329b225
Merge pull request #3825 from aledbf/release-0.23
Release 0.23.0
2019-02-27 09:28:24 -08:00
Alex Kursell
25a0d7a01c Fix plugin install location 2019-02-27 12:26:12 -05:00
Manuel Alejandro de Brito Fontes
f27b6e2109 Release 0.23.0 2019-02-27 13:21:53 -03:00
Kubernetes Prow Robot
a1b2e132e5
Merge pull request #3822 from Shopify/satisfy-default-remove
Set default for satisfy annotation to nothing
2019-02-27 06:13:06 -08:00
Alex Kursell
28d99c6d7d Set default for satisfy annotation to nothing 2019-02-26 15:05:45 -05:00
Kubernetes Prow Robot
166dd1a41f
Merge pull request #3821 from aledbf/update-nginx
Update nginx to 1.15.9
2019-02-26 10:36:27 -08:00
Kubernetes Prow Robot
4ed3339739
Merge pull request #3820 from aledbf/master
Update nginx image
2019-02-26 10:34:20 -08:00
Manuel Alejandro de Brito Fontes
f899506b2b Update nginx image 2019-02-26 14:38:09 -03:00
Manuel Alejandro de Brito Fontes
46d15e0039 Update nginx to 1.15.9 2019-02-26 14:19:53 -03:00
Kubernetes Prow Robot
ec3a2d6bc7
Merge pull request #3819 from aledbf/fix-e2e-osx
Fix e2e test in osx
2019-02-26 08:41:54 -08:00
Manuel Alejandro de Brito Fontes
51c6e950a3
Fix e2e test in osx 2019-02-26 12:46:38 -03:00
Kubernetes Prow Robot
ec632817ad
Merge pull request #3780 from arturxx8/master
Enable access log for default backend
2019-02-26 05:51:39 -08:00
Mikhail Marchenko
8b3702c829 Enable access log for default backend
disable log on default_server
2019-02-26 11:14:31 +03:00
Kubernetes Prow Robot
2fcbcbcb8b
Merge pull request #3779 from Shopify/dbg-kubectl
Add kubectl plugin
2019-02-25 17:41:23 -08:00
Alex Kursell
9e424a4a6a Add kubectl plugin 2019-02-25 15:54:00 -05:00
Kubernetes Prow Robot
c50fe1bc68
Merge pull request #3813 from Shopify/stop-fortune-teller-dependencies
Prevent dep from vendoring grpc-fortune-teller dependencies
2019-02-25 11:46:25 -08:00
Kubernetes Prow Robot
bb7a3f3527
Merge pull request #3812 from ecosia/jg-customerrors-e2e-removeunused
Removes unused const from customhttperrors e2e test
2019-02-25 11:40:57 -08:00
Kubernetes Prow Robot
e8bfa9a587
Merge pull request #3810 from aledbf/update-nginx
Update nginx image
2019-02-25 11:05:19 -08:00
Alex Kursell
1ce405bddd Prevent dep from vendoring grpc-fortune-teller dependencies 2019-02-25 13:55:43 -05:00
Kubernetes Prow Robot
7b737df49a
Merge pull request #3799 from Shopify/dbg-certs
Add /dbg certs command
2019-02-25 10:37:12 -08:00
Manuel Alejandro de Brito Fontes
e0d1060606 Update nginx image 2019-02-25 13:46:39 -03:00
Alex Kursell
c96eae3015 Add /dbg certs command 2019-02-25 11:38:07 -05:00
jasongwartz
164b8590a3 Removes unused const from customhttperrors e2e test 2019-02-25 17:27:05 +01:00
Kubernetes Prow Robot
50ca26a89a
Merge pull request #3811 from aledbf/fix-master
Fix e2e tests
2019-02-25 08:25:12 -08:00
Manuel Alejandro de Brito Fontes
11177c95ec Fix e2e tests 2019-02-25 12:37:20 -03:00
Kubernetes Prow Robot
d8ec96ca7d
Merge pull request #3730 from ecosia/jg-customerrors-defaultbackend
Changes CustomHTTPErrors annotation to use custom default backend
2019-02-25 07:22:07 -08:00
Kubernetes Prow Robot
88c2909dee
Merge pull request #3809 from ArchangelSDY/upgrade-lua-resty-balancer
Upgrade openresty/lua-resty-balancer
2019-02-25 06:27:31 -08:00
Dayang Shen
db4d012a97 Upgrade openresty/lua-resty-balancer
This fixes bug in chash:reinit which prevents endpoints from being
updated correctly.

See https://github.com/openresty/lua-resty-balancer/pull/25
2019-02-25 21:33:45 +08:00
Kubernetes Prow Robot
8f5e7de623
Merge pull request #3800 from aledbf/refactor-e2e
Refactor e2e
2019-02-24 16:33:54 -08:00
Manuel Alejandro de Brito Fontes
5e249d3366
Refactor e2e tests to use the service ClusterIP 2019-02-24 20:04:07 -03:00