Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: services configuration documentation. #5359

Merged
merged 2 commits into from
Sep 12, 2019
Merged

fix: services configuration documentation. #5359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26fdfcc
fix: services configuration documentation.
ldez Sep 11, 2019
1fdde63
doc: fix digest.
ldez Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions docs/content/middlewares/digestauth.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ metadata:

data:
users: |2
dGVzdDokYXByMSRINnVza2trVyRJZ1hMUDZld1RyU3VCa1RycUU4d2ovCnRlc3QyOiRhcHIxJGQ5
aHI5SEJCJDRIeHdnVWlyM0hQNEVzZ2dQL1FObzAK
dGVzdDp0cmFlZmlrOmEyNjg4ZTAzMWVkYjRiZTZhMzc5N2YzODgyNjU1YzA1CnRlc3QyOnRyYWVmaWs6NTE4ODQ1ODAwZjllMmJmYjFmMWY3NDBlYzI0ZjA3NGUKCg==
```

```json tab="Marathon"
Expand Down
38 changes: 19 additions & 19 deletions docs/content/routing/services/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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/"
Expand Down
3 changes: 0 additions & 3 deletions pkg/middlewares/auth/basic_auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 0 additions & 4 deletions pkg/provider/kubernetes/crd/kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down