homelab/traefik
1
0
Fork 0
Code Activity

Merge current v2.6 into master

Browse source
This commit is contained in:
Tom Moulard 2022-02-21 14:05:28 +01:00
commit 25725e9b2f
No known key found for this signature in database
GPG key ID: 521ABE0C1A0DEAF6
45 changed files with 155 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkg/config/runtime/runtime_http_test.go
View file

@ -186,7 +186,6 @@ func TestGetRoutersByEntryPoints(t *testing.T) {
"webs": {
"bar": {
Router: &dynamic.Router{
EntryPoints: []string{"webs"},
Service: "bar-service@myprovider",
Rule: "Host(`foo.bar`)",

1
pkg/config/runtime/runtime_tcp_test.go
View file

@ -186,7 +186,6 @@ func TestGetTCPRoutersByEntryPoints(t *testing.T) {
"webs": {
"bar": {
TCPRouter: &dynamic.TCPRouter{
EntryPoints: []string{"webs"},
Service: "bar-service@myprovider",
Rule: "HostSNI(`foo.bar`)",

6
pkg/config/runtime/runtime_test.go
View file

@ -144,7 +144,7 @@ func TestPopulateUsedBy(t *testing.T) {
},
},
{
desc: "2 different Services each used by a disctinct router.",
desc: "2 different Services each used by a distinct router.",
conf: &runtime.Configuration{
Services: map[string]*runtime.ServiceInfo{
"foo-service@myprovider": {
@ -384,7 +384,7 @@ func TestPopulateUsedBy(t *testing.T) {
},
},
{
desc: "2 middlewares from 2 disctinct providers both used by 2 Routers",
desc: "2 middlewares from 2 distinct providers both used by 2 Routers",
conf: &runtime.Configuration{
Services: map[string]*runtime.ServiceInfo{
"foo-service@myprovider": {
@ -593,7 +593,7 @@ func TestPopulateUsedBy(t *testing.T) {
},
},
{
desc: "TCP, 2 different Services each used by a disctinct router.",
desc: "TCP, 2 different Services each used by a distinct router.",
conf: &runtime.Configuration{
TCPServices: map[string]*runtime.TCPServiceInfo{
"foo-service@myprovider": {

1
pkg/config/runtime/runtime_udp_test.go
View file

@ -169,7 +169,6 @@ func TestGetUDPRoutersByEntryPoints(t *testing.T) {
"webs": {
"bar": {
UDPRouter: &dynamic.UDPRouter{
EntryPoints: []string{"webs"},
Service: "bar-service@myprovider",
},