Skip to content

fix(destination): properly discover hostports in native sidecars #14786

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

Merged
alpeb merged 1 commit into from
Dec 8, 2025
Merged

fix(destination): properly discover hostports in native sidecars #14786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 controller/api/destination/watcher/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func InitializeIndexers(k8sAPI *k8s.API) error {
// each of its containers' ports that exposes a host port, add
// that hostIP:hostPort endpoint to the indexer.
addrs := []string{}
for _, c := range pod.Spec.Containers {
for _, c := range append(pod.Spec.InitContainers, pod.Spec.Containers...) {
for _, p := range c.Ports {
if p.HostPort == 0 {
continue
Expand Down
22 changes: 21 additions & 1 deletion controller/api/destination/watcher/workload_watcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
func TestIpWatcherGetPod(t *testing.T) {
podIP := "10.255.0.1"
hostIP := "172.0.0.1"
var hostPort0 uint32 = 22344
var hostPort1 uint32 = 22345
var hostPort2 uint32 = 22346
expectedPodName := "hostPortPod1"
Expand All @@ -21,9 +22,16 @@ metadata:
name: hostPortPod1
namespace: ns
spec:
initContainers:
- image: test
name: hostPortInitContainer
ports:
- containerPort: 12344
hostPort: 22344
containers:
- image: test
name: hostPortContainer1
restartPolicy: Always
ports:
- containerPort: 12345
hostIP: 172.0.0.1
Expand Down Expand Up @@ -67,8 +75,20 @@ status:
}),
}

// Get host IP pod that is mapped to the port `hostPort0` (in an init container)
pod, err := ww.getPodByHostIP(hostIP, hostPort0)
if err != nil {
t.Fatalf("failed to get pod: %s", err)
}
if pod == nil {
t.Fatalf("failed to find pod mapped to %s:%d", hostIP, hostPort1)
}
if pod.Name != expectedPodName {
t.Fatalf("expected pod name to be %s, but got %s", expectedPodName, pod.Name)
}

// Get host IP pod that is mapped to the port `hostPort1`
pod, err := ww.getPodByHostIP(hostIP, hostPort1)
pod, err = ww.getPodByHostIP(hostIP, hostPort1)
if err != nil {
t.Fatalf("failed to get pod: %s", err)
}
Expand Down