fix: services configuration documentation.

traefik · Sep 12, 2019 · 7357d5e · 7357d5e
1 parent e40e3af
commit 7357d5e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 28 deletions.
diff --git a/docs/content/middlewares/digestauth.md b/docs/content/middlewares/digestauth.md
@@ -97,8 +97,7 @@ metadata:
 
 data:
   users: |2
-    dGVzdDokYXByMSRINnVza2trVyRJZ1hMUDZld1RyU3VCa1RycUU4d2ovCnRlc3QyOiRhcHIxJGQ5
-    aHI5SEJCJDRIeHdnVWlyM0hQNEVzZ2dQL1FObzAK
+    dGVzdDp0cmFlZmlrOmEyNjg4ZTAzMWVkYjRiZTZhMzc5N2YzODgyNjU1YzA1CnRlc3QyOnRyYWVmaWs6NTE4ODQ1ODAwZjllMmJmYjFmMWY3NDBlYzI0ZjA3NGUKCg==
 ```
 
 ```json tab="Marathon"

diff --git a/docs/content/routing/services/index.md b/docs/content/routing/services/index.md
@@ -312,11 +312,11 @@ This strategy can be defined only with [File](../../providers/file.md).
 
 ```toml tab="TOML"
 [http.services]
-  [http.services.canary]
-    [[http.services.canary.weighted.services]]
+  [http.services.app]
+    [[http.services.app.weighted.services]]
       name = "appv1"
       weight = 3
-    [[http.services.canary.weighted.services]]
+    [[http.services.app.weighted.services]]
       name = "appv2"
       weight = 1
 
@@ -334,7 +334,7 @@ This strategy can be defined only with [File](../../providers/file.md).
 ```yaml tab="YAML"
 http:
   services:
-    canary:
+    app:
       weighted:
         services:
         - name: appv1
@@ -361,40 +361,40 @@ This strategy can be defined only with [File](../../providers/file.md).
 
 ```toml tab="TOML"
 [http.services]
-  [http.services.mirroring]
-    [http.services.mirroring.mirroring]
-      service = "app"
-    [[http.services.mirroring.mirroring.mirrors]]
-      name = "mirror"
+  [http.services.mirrored-api]
+    [http.services.mirrored-api.mirroring]
+      service = "appv1"
+    [[http.services.mirrored-api.mirroring.mirrors]]
+      name = "appv2"
       percent = 10
 
-  [http.services.app]
-    [http.services.app.loadBalancer]
+  [http.services.appv1]
+    [http.services.appv1.loadBalancer]
       [[http.services.appv1.loadBalancer.servers]]
         url = "http://private-ip-server-1/"
 
-  [http.services.mirror]
-    [http.services.mirror.loadBalancer]
-      [[http.services.mirror.loadBalancer.servers]]
+  [http.services.appv2]
+    [http.services.appv2.loadBalancer]
+      [[http.services.appv2.loadBalancer.servers]]
         url = "http://private-ip-server-2/"
 ```
 
 ```yaml tab="YAML"
 http:
   services:
-    mirroring:
+    mirrored-api:
       mirroring:
-        service: app
+        service: appv1
         mirrors:
-        - name: mirror
+        - name: appv2
           percent: 10
 
-    app:
+    appv1:
       loadBalancer:
         servers:
         - url: "http://private-ip-server-1/"
 
-    mirror:
+    appv2:
       loadBalancer:
         servers:
         - url: "http://private-ip-server-2/"

diff --git a/pkg/middlewares/auth/basic_auth_test.go b/pkg/middlewares/auth/basic_auth_test.go
@@ -210,9 +210,6 @@ func TestBasicAuthUsersFromFile(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		if test.desc != "Should skip comments" {
-			continue
-		}
 		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()

diff --git a/pkg/provider/kubernetes/crd/kubernetes_test.go b/pkg/provider/kubernetes/crd/kubernetes_test.go
@@ -1543,10 +1543,6 @@ func TestLoadIngressRoutes(t *testing.T) {
 
 	for _, test := range testCases {
 		test := test
-
-		if test.desc != "Simple Ingress Route, with error page middleware" {
-			continue
-		}
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()