Fix incorrect behaviour with multi-port endpoint subsets

This commit is contained in:
Jakub Coufal 2021-05-28 00:58:07 +02:00 committed by GitHub
parent 376b6f90d9
commit 1680f00091
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 80 additions and 1 deletions

View file

@ -0,0 +1,20 @@
kind: Endpoints
apiVersion: v1
metadata:
name: service1
namespace: testing
subsets:
- addresses:
- ip: 10.10.0.1
- ip: 10.10.0.2
ports:
- name: tchouk
port: 8089
- addresses:
- ip: 10.10.0.1
- ip: 10.10.0.2
- ip: 10.10.0.3
ports:
- name: carotte
port: 8090

View file

@ -0,0 +1,15 @@
kind: Ingress
apiVersion: networking.k8s.io/v1beta1
metadata:
name: ""
namespace: testing
spec:
rules:
- host: traefik.tchouk
http:
paths:
- path: /bar
backend:
serviceName: service1
servicePort: tchouk

View file

@ -0,0 +1,14 @@
kind: Service
apiVersion: v1
metadata:
name: service1
namespace: testing
spec:
ports:
- name: carotte
port: 8082
- name: tchouk
port: 80
clusterIP: 10.0.0.1

View file

@ -529,8 +529,8 @@ func loadService(client Client, namespace string, backend networkingv1beta1.Ingr
return nil, errors.New("subset not found") return nil, errors.New("subset not found")
} }
var port int32
for _, subset := range endpoints.Subsets { for _, subset := range endpoints.Subsets {
var port int32
for _, p := range subset.Ports { for _, p := range subset.Ports {
if portName == p.Name { if portName == p.Name {
port = p.Port port = p.Port

View file

@ -633,6 +633,36 @@ func TestLoadConfigurationFromIngresses(t *testing.T) {
}, },
}, },
}, },
{
desc: "Ingress with a named port matching subset of service pods",
expected: &dynamic.Configuration{
TCP: &dynamic.TCPConfiguration{},
HTTP: &dynamic.HTTPConfiguration{
Middlewares: map[string]*dynamic.Middleware{},
Routers: map[string]*dynamic.Router{
"testing-traefik-tchouk-bar": {
Rule: "Host(`traefik.tchouk`) && PathPrefix(`/bar`)",
Service: "testing-service1-tchouk",
},
},
Services: map[string]*dynamic.Service{
"testing-service1-tchouk": {
LoadBalancer: &dynamic.ServersLoadBalancer{
PassHostHeader: Bool(true),
Servers: []dynamic.Server{
{
URL: "http://10.10.0.1:8089",
},
{
URL: "http://10.10.0.2:8089",
},
},
},
},
},
},
},
},
{ {
desc: "2 ingresses in different namespace with same service name", desc: "2 ingresses in different namespace with same service name",
expected: &dynamic.Configuration{ expected: &dynamic.Configuration{