Merge branch 'v2.0' into master

2019-11-15 13:34:41 +01:00 · 2019-11-15 13:34:41 +01:00 · ca9eaf383a
commit ca9eaf383a
parent f30a52c2dc 42a8d84a1f
42 changed files with 645 additions and 444 deletions
--- a/pkg/metrics/prometheus_test.go
+++ b/pkg/metrics/prometheus_test.go
@ -290,6 +290,11 @@ func TestPrometheusMetricRemoval(t *testing.T) {
 			th.WithLoadBalancerServices(th.WithService("bar@providerName",
 				th.WithServers(th.WithServer("http://localhost:9000"))),
 			),
+			func(cfg *dynamic.HTTPConfiguration) {
+				cfg.Services["fii"] = &dynamic.Service{
+					Weighted: &dynamic.WeightedRoundRobin{},
+				}
+			},
 		),
 	}