Skip to content

V0.7.7 dc publicip #3

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

Open
AlexZhenWang wants to merge 3 commits into
base: hostport4ex-ip
Choose a base branch
from
Open

V0.7.7 dc publicip #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
757af51
0.7.7
AlexZhenWang Dec 7, 2023
a49d044
externaIP for service
AlexZhenWang Dec 7, 2023
c11cd85
update extractHeadlessEndpoints
AlexZhenWang Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY go.sum .
RUN go mod download

COPY . .
RUN make test build.$ARCH
RUN make build.$ARCH

# final image
FROM $ARCH/alpine:3.13
Expand Down
4 changes: 4 additions & 0 deletions source/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ func (ns *nodeSource) AddEventHandler(ctx context.Context, handler func()) {
// nodeAddress returns node's externalIP and if that's not found, node's internalIP
// basically what k8s.io/kubernetes/pkg/util/node.GetPreferredNodeAddress does
func (ns *nodeSource) nodeAddresses(node *v1.Node) ([]string, error) {
if externalIP, exists := node.Labels["ExternalIP"]; exists {
return []string{externalIP}, nil
}

addresses := map[v1.NodeAddressType][]string{
v1.NodeExternalIP: {},
v1.NodeInternalIP: {},
Expand Down
8 changes: 8 additions & 0 deletions source/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,10 @@ func (sc *serviceSource) extractHeadlessEndpoints(svc *v1.Service, hostname stri
case v1.NodeExternalIP:
externalIP = address.Address
}

if externalIPLabel, exists := node.Labels["ExternalIP"]; exists {
externalIP = externalIPLabel
}
}
}

Expand Down Expand Up @@ -631,6 +635,10 @@ func (sc *serviceSource) extractNodePortTargets(svc *v1.Service) (endpoint.Targe
case v1.NodeInternalIP:
internalIPs = append(internalIPs, address.Address)
}

if externalIP, exists := node.Labels["ExternalIP"]; exists {
externalIPs = append(externalIPs, externalIP)
}
}
}

Expand Down