Merge branch v2.11 into v3.3
This commit is contained in:
commit
f6fb240eb6
44 changed files with 940 additions and 597 deletions
|
@ -585,8 +585,8 @@ func (c configBuilder) nameAndService(ctx context.Context, parentNamespace strin
|
|||
return "", nil, fmt.Errorf("service %s/%s not in the parent resource namespace %s", service.Namespace, service.Name, parentNamespace)
|
||||
}
|
||||
|
||||
switch {
|
||||
case service.Kind == "" || service.Kind == "Service":
|
||||
switch service.Kind {
|
||||
case "", "Service":
|
||||
serversLB, err := c.buildServersLB(namespace, service)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
|
@ -595,8 +595,10 @@ func (c configBuilder) nameAndService(ctx context.Context, parentNamespace strin
|
|||
fullName := fullServiceName(svcCtx, namespace, service, service.Port)
|
||||
|
||||
return fullName, serversLB, nil
|
||||
case service.Kind == "TraefikService":
|
||||
|
||||
case "TraefikService":
|
||||
return fullServiceName(svcCtx, namespace, service, intstr.FromInt(0)), nil, nil
|
||||
|
||||
default:
|
||||
return "", nil, fmt.Errorf("unsupported service kind %s", service.Kind)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue