baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Place namespace before name in router key for Ingress

Browse source
This commit is contained in:
longshine 2022-08-04 16:22:08 +08:00 committed by GitHub
parent b4ee7bdcbe
commit 1576ad85b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration/testdata/rawdata-ingress-label-selector.json vendored
View file

@ -28,7 +28,7 @@
"traefik" "traefik"
] ]
}, },
"test-ingress-default-whoami-test-whoami@kubernetes": { "default-test-ingress-whoami-test-whoami@kubernetes": {
"entryPoints": [ "entryPoints": [
"web" "web"
], ],
@ -92,7 +92,7 @@
}, },
"status": "enabled", "status": "enabled",
"usedBy": [ "usedBy": [
"test-ingress-default-whoami-test-whoami@kubernetes" "default-test-ingress-whoami-test-whoami@kubernetes"
], ],
"serverStatus": { "serverStatus": {
"http://10.42.0.2:80": "UP", "http://10.42.0.2:80": "UP",

36
integration/testdata/rawdata-ingress.json vendored
View file

@ -28,18 +28,7 @@
"traefik" "traefik"
] ]
}, },
"test-ingress-default-whoami-test-whoami@kubernetes": { "default-test-ingress-https-whoami-test-https-whoami@kubernetes": {
"entryPoints": [
"web"
],
"service": "default-whoami-http",
"rule": "Host(`whoami.test`) \u0026\u0026 PathPrefix(`/whoami`)",
"status": "enabled",
"using": [
"web"
]
},
"test-ingress-https-default-whoami-test-https-whoami@kubernetes": {
"entryPoints": [ "entryPoints": [
"web" "web"
], ],
@ -50,7 +39,18 @@
"web" "web"
] ]
}, },
"whoami-drop-route-default-whoami-test-drop-drop@kubernetes": { "default-test-ingress-whoami-test-whoami@kubernetes": {
"entryPoints": [
"web"
],
"service": "default-whoami-http",
"rule": "Host(`whoami.test`) \u0026\u0026 PathPrefix(`/whoami`)",
"status": "enabled",
"using": [
"web"
]
},
"default-whoami-drop-route-whoami-test-drop-drop@kubernetes": {
"entryPoints": [ "entryPoints": [
"web" "web"
], ],
@ -61,7 +61,7 @@
"web" "web"
] ]
}, },
"whoami-keep-route-default-whoami-test-keep-keep@kubernetes": { "default-whoami-keep-route-whoami-test-keep-keep@kubernetes": {
"entryPoints": [ "entryPoints": [
"web" "web"
], ],
@ -125,8 +125,8 @@
}, },
"status": "enabled", "status": "enabled",
"usedBy": [ "usedBy": [
"whoami-drop-route-default-whoami-test-drop-drop@kubernetes", "default-whoami-drop-route-whoami-test-drop-drop@kubernetes",
"whoami-keep-route-default-whoami-test-keep-keep@kubernetes" "default-whoami-keep-route-whoami-test-keep-keep@kubernetes"
], ],
"serverStatus": { "serverStatus": {
"http://XXXX": "UP", "http://XXXX": "UP",
@ -147,8 +147,8 @@
}, },
"status": "enabled", "status": "enabled",
"usedBy": [ "usedBy": [
"test-ingress-default-whoami-test-whoami@kubernetes", "default-test-ingress-https-whoami-test-https-whoami@kubernetes",
"test-ingress-https-default-whoami-test-https-whoami@kubernetes" "default-test-ingress-whoami-test-whoami@kubernetes"
], ],
"serverStatus": { "serverStatus": {
"http://10.42.0.10:80": "UP", "http://10.42.0.10:80": "UP",

4
integration/testdata/rawdata-ingressclass.json vendored
View file

@ -28,7 +28,7 @@
"traefik" "traefik"
] ]
}, },
"whoami-keep-route-default-whoami-test-keep-keep@kubernetes": { "default-whoami-keep-route-whoami-test-keep-keep@kubernetes": {
"entryPoints": [ "entryPoints": [
"web" "web"
], ],
@ -92,7 +92,7 @@
}, },
"status": "enabled", "status": "enabled",
"usedBy": [ "usedBy": [
"whoami-keep-route-default-whoami-test-keep-keep@kubernetes" "default-whoami-keep-route-whoami-test-keep-keep@kubernetes"
], ],
"serverStatus": { "serverStatus": {
"http://10.42.0.4:80": "UP", "http://10.42.0.4:80": "UP",

2
pkg/provider/kubernetes/ingress/kubernetes.go
View file

@ -304,7 +304,7 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl
serviceName := provider.Normalize(ingress.Namespace + "-" + pa.Backend.Service.Name + "-" + portString) serviceName := provider.Normalize(ingress.Namespace + "-" + pa.Backend.Service.Name + "-" + portString)
conf.HTTP.Services[serviceName] = service conf.HTTP.Services[serviceName] = service
routerKey := strings.TrimPrefix(provider.Normalize(ingress.Name+"-"+ingress.Namespace+"-"+rule.Host+pa.Path), "-") routerKey := strings.TrimPrefix(provider.Normalize(ingress.Namespace+"-"+ingress.Name+"-"+rule.Host+pa.Path), "-")
routers[routerKey] = append(routers[routerKey], loadRouter(rule, pa, rtConfig, serviceName)) routers[routerKey] = append(routers[routerKey], loadRouter(rule, pa, rtConfig, serviceName))
} }
} }

4
pkg/provider/kubernetes/ingress/kubernetes_test.go
View file

@ -1696,7 +1696,7 @@ func TestLoadConfigurationFromIngressesWithExternalNameServices(t *testing.T) {
HTTP: &dynamic.HTTPConfiguration{ HTTP: &dynamic.HTTPConfiguration{
Middlewares: map[string]*dynamic.Middleware{}, Middlewares: map[string]*dynamic.Middleware{},
Routers: map[string]*dynamic.Router{ Routers: map[string]*dynamic.Router{
"example-com-testing-bar": { "testing-example-com-bar": {
Rule: "PathPrefix(`/bar`)", Rule: "PathPrefix(`/bar`)",
Service: "testing-service-bar-8080", Service: "testing-service-bar-8080",
}, },
@ -1724,7 +1724,7 @@ func TestLoadConfigurationFromIngressesWithExternalNameServices(t *testing.T) {
HTTP: &dynamic.HTTPConfiguration{ HTTP: &dynamic.HTTPConfiguration{
Middlewares: map[string]*dynamic.Middleware{}, Middlewares: map[string]*dynamic.Middleware{},
Routers: map[string]*dynamic.Router{ Routers: map[string]*dynamic.Router{
"example-com-testing-foo": { "testing-example-com-foo": {
Rule: "PathPrefix(`/foo`)", Rule: "PathPrefix(`/foo`)",
Service: "testing-service-foo-8080", Service: "testing-service-foo-8080",
}, },