Commit graph

4050 commits

Author SHA1 Message Date
Kubernetes Prow Robot
82b78c1d85 Merge pull request #3853 from aledbf/remove-authbind
Remove authbind
2019-03-11 07:09:29 -07:00
Kubernetes Prow Robot
60cf9bd244 Merge pull request #3886 from ElvinEfendi/fix-dynamic-cert-mode
Clean up ssl package and fix dynamic cert mode
2019-03-11 04:53:27 -07:00
Elvin Efendi
17cc3131d2 fix function comment 2019-03-11 00:53:06 -04:00
Elvin Efendi
82d4a668b2 bugfix: when secret includes ca.crt store it on disk even in dynamic cert mode 2019-03-11 00:53:06 -04:00
Elvin Efendi
8ed2c1c412 adjust unit tests 2019-03-11 00:53:06 -04:00
Elvin Efendi
2b94ab5daa clean up certificate processing 2019-03-11 00:53:06 -04:00
Elvin Efendi
d54dfc90b0 do not repeat cert verification against root ca 2019-03-11 00:53:06 -04:00
Elvin Efendi
cf9b844ad5 extract common logic into a helper 2019-03-11 00:53:06 -04:00
Kubernetes Prow Robot
3904518804 Merge pull request #3884 from cartyc/gke-doc-link
update GKE header to match link in contents
2019-03-10 07:07:25 -07:00
Chris Carty
5a420c68c3 update GKE header to match link in contents 2019-03-10 09:13:34 -04:00
Kubernetes Prow Robot
5d353bda41 Merge pull request #3864 from alpeb/multihosts_servicename
ing.Service with multiple hosts fix
2019-03-09 05:09:27 -08:00
Kubernetes Prow Robot
dc87bbbdfa Merge pull request #3874 from joelsmith/secdoc
Update embargo doc link in SECURITY_OWNERS and change PST to PSC
2019-03-08 11:16:56 -08:00
Joel Smith
5f3e7750f1 Update embargo doc link in SECURITY_OWNERS and changes PST to PSC 2019-03-08 10:23:48 -07:00
Manuel Alejandro de Brito Fontes
e86b473b5e Fix name of field used to sort ingresses (#3871) 2019-03-07 21:24:46 -03:00
Alejandro Pedraza
8526d1ce81 Add test
Signed-off-by: Alejandro Pedraza <alejandro.pedraza@gmail.com>
2019-03-07 06:18:06 -05:00
Alejandro Pedraza
7f26af1da5 Properly set ing.Service when there are multiple rules with different hosts using the same path
Fixes #3611

Signed-off-by: Alejandro Pedraza <alejandro.pedraza@gmail.com>
2019-03-07 06:06:24 -05:00
Kubernetes Prow Robot
44a5bbc56e 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
09f86b1598 Fix ssl-dh-param issue when secret does not exit 2019-03-05 16:31:33 -03:00
Manuel Alejandro de Brito Fontes
f74cae1daa Remove authbind 2019-03-05 10:08:34 -03:00
Kubernetes Prow Robot
63e093832c 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
fe0243747a 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
42e5e510d3 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
38dc54d505 Use Gauge instead of Counter for connections_active Prometheus metric 2019-03-04 22:35:45 +01:00
Thibault Jamet
42f88d9e1c 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
b26365d1cc 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
58c987189a 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
27c85851ad Remove session-cookie-hash annotation 2019-03-04 10:34:48 -05:00
Per Bernhardt
a61cff7444 Fix panic on multiple non-matching canary 2019-03-04 12:30:59 +01:00
Kubernetes Prow Robot
c7c886276a 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
1970f0f069 Update mkdocs [skip ci] (#3836) 2019-03-02 15:02:31 -03:00
Kubernetes Prow Robot
d5aff3895b Merge pull request #3835 from aledbf/update-nginx
Update nginx image
2019-03-01 05:03:25 -08:00
Manuel Alejandro de Brito Fontes
abee8b8246 Update nginx image 2019-03-01 09:18:45 -03:00
Kubernetes Prow Robot
9ed20bcb54 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
77b212a2e8 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
d847b8e202 Prevent e2e-tests from running on non-local clusters 2019-02-28 10:54:43 -05:00
Kubernetes Prow Robot
5c9091a928 Merge pull request #3827 from Shopify/fix-plugin-install-docs
Fix plugin install location
2019-02-27 12:40:15 -08:00
Alex Kursell
2b382dfacc Use incantation from release page 2019-02-27 12:57:55 -05:00
Kubernetes Prow Robot
eb44093c50 Merge pull request #3825 from aledbf/release-0.23
Release 0.23.0
2019-02-27 09:28:24 -08:00
Alex Kursell
8fdb64fd3d Fix plugin install location 2019-02-27 12:26:12 -05:00
Manuel Alejandro de Brito Fontes
c7ab43a865 Release 0.23.0 2019-02-27 13:21:53 -03:00
Kubernetes Prow Robot
83b5e6d105 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
684fb42bca Set default for satisfy annotation to nothing 2019-02-26 15:05:45 -05:00
Kubernetes Prow Robot
e75126cd39 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
1d9ea91cde Merge pull request #3820 from aledbf/master
Update nginx image
2019-02-26 10:34:20 -08:00
Manuel Alejandro de Brito Fontes
829d4af0a5 Update nginx image 2019-02-26 14:38:09 -03:00
Manuel Alejandro de Brito Fontes
f3c6511c3e Update nginx to 1.15.9 2019-02-26 14:19:53 -03:00
Kubernetes Prow Robot
70fa56da2d 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
37c11705cc Fix e2e test in osx 2019-02-26 12:46:38 -03:00
Kubernetes Prow Robot
502706b6f1 Merge pull request #3780 from arturxx8/master
Enable access log for default backend
2019-02-26 05:51:39 -08:00
Mikhail Marchenko
9ff92ade8c Enable access log for default backend
disable log on default_server
2019-02-26 11:14:31 +03:00