Merge pull request #3734 from fad3t/ambassador-external-ip

feat: add support for external IP in ambassador host source
This commit is contained in:
Kubernetes Prow Robot 2023-10-27 13:22:02 +02:00 committed by GitHub
commit d8f408b8a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -185,7 +185,7 @@ func (sc *ambassadorHostSource) endpointsFromHost(ctx context.Context, host *amb
return endpoints, nil return endpoints, nil
} }
func (sc *ambassadorHostSource) targetsFromAmbassadorLoadBalancer(ctx context.Context, service string) (targets endpoint.Targets, err error) { func (sc *ambassadorHostSource) targetsFromAmbassadorLoadBalancer(ctx context.Context, service string) (endpoint.Targets, error) {
lbNamespace, lbName, err := parseAmbLoadBalancerService(service) lbNamespace, lbName, err := parseAmbLoadBalancerService(service)
if err != nil { if err != nil {
return nil, err return nil, err
@ -196,16 +196,9 @@ func (sc *ambassadorHostSource) targetsFromAmbassadorLoadBalancer(ctx context.Co
return nil, err return nil, err
} }
for _, lb := range svc.Status.LoadBalancer.Ingress { var targets = extractLoadBalancerTargets(svc, true)
if lb.IP != "" {
targets = append(targets, lb.IP)
}
if lb.Hostname != "" {
targets = append(targets, lb.Hostname)
}
}
return return targets, nil
} }
// parseAmbLoadBalancerService returns a name/namespace tuple from the annotation in // parseAmbLoadBalancerService returns a name/namespace tuple from the annotation in