homelab/traefik
1
0
Fork 0
Code Activity

Merge current v2.11 into v3.0

Browse source
This commit is contained in:
mmatur 2024-03-12 10:38:29 +01:00
commit 05be441027
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
156 changed files with 5826 additions and 8436 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/provider/traefik/fixtures/api_insecure_with_dashboard.json
View file

@ -7,7 +7,7 @@
],
"service": "api@internal",
"rule": "PathPrefix(`/api`)",
"priority": 2147483646
"priority": 9223372036854775806
},
"dashboard": {
"entryPoints": [
@ -19,7 +19,7 @@
],
"service": "dashboard@internal",
"rule": "PathPrefix(`/`)",
"priority": 2147483645
"priority": 9223372036854775805
}
},
"services": {
@ -47,4 +47,4 @@
},
"tcp": {},
"tls": {}
}
}

4
pkg/provider/traefik/fixtures/api_insecure_without_dashboard.json
View file

@ -7,7 +7,7 @@
],
"service": "api@internal",
"rule": "PathPrefix(`/api`)",
"priority": 2147483646
"priority": 9223372036854775806
}
},
"services": {
@ -17,4 +17,4 @@
},
"tcp": {},
"tls": {}
}
}

14
pkg/provider/traefik/fixtures/full_configuration.json
View file

@ -7,7 +7,7 @@
],
"service": "api@internal",
"rule": "PathPrefix(`/api`)",
"priority": 2147483646
"priority": 9223372036854775806
},
"dashboard": {
"entryPoints": [
@ -19,7 +19,7 @@
],
"service": "dashboard@internal",
"rule": "PathPrefix(`/`)",
"priority": 2147483645
"priority": 9223372036854775805
},
"debug": {
"entryPoints": [
@ -27,7 +27,7 @@
],
"service": "api@internal",
"rule": "PathPrefix(`/debug`)",
"priority": 2147483646
"priority": 9223372036854775806
},
"ping": {
"entryPoints": [
@ -35,7 +35,7 @@
],
"service": "ping@internal",
"rule": "PathPrefix(`/ping`)",
"priority": 2147483647
"priority": 9223372036854775807
},
"prometheus": {
"entryPoints": [
@ -43,7 +43,7 @@
],
"service": "prometheus@internal",
"rule": "PathPrefix(`/metrics`)",
"priority": 2147483647
"priority": 9223372036854775807
},
"rest": {
"entryPoints": [
@ -51,7 +51,7 @@
],
"service": "rest@internal",
"rule": "PathPrefix(`/api/providers`)",
"priority": 2147483647
"priority": 9223372036854775807
}
},
"services": {
@ -82,4 +82,4 @@
},
"tcp": {},
"tls": {}
}
}

4
pkg/provider/traefik/fixtures/ping_simple.json
View file

@ -7,7 +7,7 @@
],
"service": "ping@internal",
"rule": "PathPrefix(`/ping`)",
"priority": 2147483647
"priority": 9223372036854775807
}
},
"services": {
@ -17,4 +17,4 @@
},
"tcp": {},
"tls": {}
}
}

4
pkg/provider/traefik/fixtures/prometheus_simple.json
View file

@ -7,7 +7,7 @@
],
"service": "prometheus@internal",
"rule": "PathPrefix(`/metrics`)",
"priority": 2147483647
"priority": 9223372036854775807
}
},
"services": {
@ -17,4 +17,4 @@
},
"tcp": {},
"tls": {}
}
}

4
pkg/provider/traefik/fixtures/rest_insecure.json
View file

@ -7,7 +7,7 @@
],
"service": "rest@internal",
"rule": "PathPrefix(`/api/providers`)",
"priority": 2147483647
"priority": 9223372036854775807
}
},
"services": {
@ -17,4 +17,4 @@
},
"tcp": {},
"tls": {}
}
}

14
pkg/provider/traefik/internal.go
View file

@ -108,7 +108,7 @@ func (i *Provider) acme(cfg *dynamic.Configuration) {
Rule: "PathPrefix(`/.well-known/acme-challenge/`)",
EntryPoints: eps,
Service: "acme-http@internal",
Priority: math.MaxInt32,
Priority: math.MaxInt,
}
cfg.HTTP.Routers["acme-http"] = rt
@ -239,7 +239,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) {
cfg.HTTP.Routers["api"] = &dynamic.Router{
EntryPoints: []string{defaultInternalEntryPointName},
Service: "api@internal",
Priority: math.MaxInt32 - 1,
Priority: math.MaxInt - 1,
Rule: "PathPrefix(`/api`)",
}
@ -247,7 +247,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) {
cfg.HTTP.Routers["dashboard"] = &dynamic.Router{
EntryPoints: []string{defaultInternalEntryPointName},
Service: "dashboard@internal",
Priority: math.MaxInt32 - 2,
Priority: math.MaxInt - 2,
Rule: "PathPrefix(`/`)",
Middlewares: []string{"dashboard_redirect@internal", "dashboard_stripprefix@internal"},
}
@ -268,7 +268,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) {
cfg.HTTP.Routers["debug"] = &dynamic.Router{
EntryPoints: []string{defaultInternalEntryPointName},
Service: "api@internal",
Priority: math.MaxInt32 - 1,
Priority: math.MaxInt - 1,
Rule: "PathPrefix(`/debug`)",
}
}
@ -290,7 +290,7 @@ func (i *Provider) pingConfiguration(cfg *dynamic.Configuration) {
cfg.HTTP.Routers["ping"] = &dynamic.Router{
EntryPoints: []string{i.staticCfg.Ping.EntryPoint},
Service: "ping@internal",
Priority: math.MaxInt32,
Priority: math.MaxInt,
Rule: "PathPrefix(`/ping`)",
}
}
@ -307,7 +307,7 @@ func (i *Provider) restConfiguration(cfg *dynamic.Configuration) {
cfg.HTTP.Routers["rest"] = &dynamic.Router{
EntryPoints: []string{defaultInternalEntryPointName},
Service: "rest@internal",
Priority: math.MaxInt32,
Priority: math.MaxInt,
Rule: "PathPrefix(`/api/providers`)",
}
}
@ -324,7 +324,7 @@ func (i *Provider) prometheusConfiguration(cfg *dynamic.Configuration) {
cfg.HTTP.Routers["prometheus"] = &dynamic.Router{
EntryPoints: []string{i.staticCfg.Metrics.Prometheus.EntryPoint},
Service: "prometheus@internal",
Priority: math.MaxInt32,
Priority: math.MaxInt,
Rule: "PathPrefix(`/metrics`)",
}
}