Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add support for external IP in ambassador host source #3734

Merged
merged 2 commits into from
Oct 27, 2023
Merged

feat: add support for external IP in ambassador host source #3734

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9099b8
feat: add support for external IP in ambassador host source
fad3t Jun 26, 2023
73862a8
chore: reuse existing extractLoadBalancerTargets function
fad3t Aug 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 3 additions & 10 deletions source/ambassador_host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func (sc *ambassadorHostSource) endpointsFromHost(ctx context.Context, host *amb
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)
if err != nil {
return nil, err
Expand All @@ -194,16 +194,9 @@ func (sc *ambassadorHostSource) targetsFromAmbassadorLoadBalancer(ctx context.Co
return nil, err
}

for _, lb := range svc.Status.LoadBalancer.Ingress {
if lb.IP != "" {
targets = append(targets, lb.IP)
}
if lb.Hostname != "" {
targets = append(targets, lb.Hostname)
}
}
var targets = extractLoadBalancerTargets(svc, true)

return
return targets, nil
}

// parseAmbLoadBalancerService returns a name/namespace tuple from the annotation in
Expand Down