fix: services configuration documentation.

This commit is contained in:
Ludovic Fernandez 2019-09-12 10:18:04 +02:00 committed by Traefiker Bot
parent e40e3af760
commit 7357d5eae2
4 changed files with 20 additions and 28 deletions

View file

@ -97,8 +97,7 @@ metadata:
data: data:
users: |2 users: |2
dGVzdDokYXByMSRINnVza2trVyRJZ1hMUDZld1RyU3VCa1RycUU4d2ovCnRlc3QyOiRhcHIxJGQ5 dGVzdDp0cmFlZmlrOmEyNjg4ZTAzMWVkYjRiZTZhMzc5N2YzODgyNjU1YzA1CnRlc3QyOnRyYWVmaWs6NTE4ODQ1ODAwZjllMmJmYjFmMWY3NDBlYzI0ZjA3NGUKCg==
aHI5SEJCJDRIeHdnVWlyM0hQNEVzZ2dQL1FObzAK
``` ```
```json tab="Marathon" ```json tab="Marathon"

View file

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

View file

@ -210,9 +210,6 @@ func TestBasicAuthUsersFromFile(t *testing.T) {
} }
for _, test := range testCases { for _, test := range testCases {
if test.desc != "Should skip comments" {
continue
}
test := test test := test
t.Run(test.desc, func(t *testing.T) { t.Run(test.desc, func(t *testing.T) {
t.Parallel() t.Parallel()

View file

@ -1543,10 +1543,6 @@ func TestLoadIngressRoutes(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
test := test test := test
if test.desc != "Simple Ingress Route, with error page middleware" {
continue
}
t.Run(test.desc, func(t *testing.T) { t.Run(test.desc, func(t *testing.T) {
t.Parallel() t.Parallel()