From 1576ad85b83b07752cd7dc1e0be9842eaf24fd46 Mon Sep 17 00:00:00 2001 From: longshine Date: Thu, 4 Aug 2022 16:22:08 +0800 Subject: [PATCH] Place namespace before name in router key for Ingress --- .../rawdata-ingress-label-selector.json | 4 +-- integration/testdata/rawdata-ingress.json | 36 +++++++++---------- .../testdata/rawdata-ingressclass.json | 4 +-- pkg/provider/kubernetes/ingress/kubernetes.go | 2 +- .../kubernetes/ingress/kubernetes_test.go | 4 +-- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/integration/testdata/rawdata-ingress-label-selector.json b/integration/testdata/rawdata-ingress-label-selector.json index 66d3b095e..497835714 100644 --- a/integration/testdata/rawdata-ingress-label-selector.json +++ b/integration/testdata/rawdata-ingress-label-selector.json @@ -28,7 +28,7 @@ "traefik" ] }, - "test-ingress-default-whoami-test-whoami@kubernetes": { + "default-test-ingress-whoami-test-whoami@kubernetes": { "entryPoints": [ "web" ], @@ -92,7 +92,7 @@ }, "status": "enabled", "usedBy": [ - "test-ingress-default-whoami-test-whoami@kubernetes" + "default-test-ingress-whoami-test-whoami@kubernetes" ], "serverStatus": { "http://10.42.0.2:80": "UP", diff --git a/integration/testdata/rawdata-ingress.json b/integration/testdata/rawdata-ingress.json index 920154fcc..2943e4cbd 100644 --- a/integration/testdata/rawdata-ingress.json +++ b/integration/testdata/rawdata-ingress.json @@ -28,18 +28,7 @@ "traefik" ] }, - "test-ingress-default-whoami-test-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": { + "default-test-ingress-https-whoami-test-https-whoami@kubernetes": { "entryPoints": [ "web" ], @@ -50,7 +39,18 @@ "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": [ "web" ], @@ -61,7 +61,7 @@ "web" ] }, - "whoami-keep-route-default-whoami-test-keep-keep@kubernetes": { + "default-whoami-keep-route-whoami-test-keep-keep@kubernetes": { "entryPoints": [ "web" ], @@ -125,8 +125,8 @@ }, "status": "enabled", "usedBy": [ - "whoami-drop-route-default-whoami-test-drop-drop@kubernetes", - "whoami-keep-route-default-whoami-test-keep-keep@kubernetes" + "default-whoami-drop-route-whoami-test-drop-drop@kubernetes", + "default-whoami-keep-route-whoami-test-keep-keep@kubernetes" ], "serverStatus": { "http://XXXX": "UP", @@ -147,8 +147,8 @@ }, "status": "enabled", "usedBy": [ - "test-ingress-default-whoami-test-whoami@kubernetes", - "test-ingress-https-default-whoami-test-https-whoami@kubernetes" + "default-test-ingress-https-whoami-test-https-whoami@kubernetes", + "default-test-ingress-whoami-test-whoami@kubernetes" ], "serverStatus": { "http://10.42.0.10:80": "UP", diff --git a/integration/testdata/rawdata-ingressclass.json b/integration/testdata/rawdata-ingressclass.json index 53db99cef..0944a7cff 100644 --- a/integration/testdata/rawdata-ingressclass.json +++ b/integration/testdata/rawdata-ingressclass.json @@ -28,7 +28,7 @@ "traefik" ] }, - "whoami-keep-route-default-whoami-test-keep-keep@kubernetes": { + "default-whoami-keep-route-whoami-test-keep-keep@kubernetes": { "entryPoints": [ "web" ], @@ -92,7 +92,7 @@ }, "status": "enabled", "usedBy": [ - "whoami-keep-route-default-whoami-test-keep-keep@kubernetes" + "default-whoami-keep-route-whoami-test-keep-keep@kubernetes" ], "serverStatus": { "http://10.42.0.4:80": "UP", diff --git a/pkg/provider/kubernetes/ingress/kubernetes.go b/pkg/provider/kubernetes/ingress/kubernetes.go index 3f7011730..5605f97b9 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes.go +++ b/pkg/provider/kubernetes/ingress/kubernetes.go @@ -304,7 +304,7 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl serviceName := provider.Normalize(ingress.Namespace + "-" + pa.Backend.Service.Name + "-" + portString) 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)) } } diff --git a/pkg/provider/kubernetes/ingress/kubernetes_test.go b/pkg/provider/kubernetes/ingress/kubernetes_test.go index 58d8226a9..c096578fc 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes_test.go +++ b/pkg/provider/kubernetes/ingress/kubernetes_test.go @@ -1696,7 +1696,7 @@ func TestLoadConfigurationFromIngressesWithExternalNameServices(t *testing.T) { HTTP: &dynamic.HTTPConfiguration{ Middlewares: map[string]*dynamic.Middleware{}, Routers: map[string]*dynamic.Router{ - "example-com-testing-bar": { + "testing-example-com-bar": { Rule: "PathPrefix(`/bar`)", Service: "testing-service-bar-8080", }, @@ -1724,7 +1724,7 @@ func TestLoadConfigurationFromIngressesWithExternalNameServices(t *testing.T) { HTTP: &dynamic.HTTPConfiguration{ Middlewares: map[string]*dynamic.Middleware{}, Routers: map[string]*dynamic.Router{ - "example-com-testing-foo": { + "testing-example-com-foo": { Rule: "PathPrefix(`/foo`)", Service: "testing-service-foo-8080", },