Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/test_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ spec:
podSelector:
matchLabels:
app: native
port: 80
port: http
proxyProtocol: opaque`,
}

Expand Down
4 changes: 2 additions & 2 deletions controller/api/destination/watcher/endpoints_watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,7 @@ func (pp *portPublisher) isAddressSelected(address Address, server *v1beta3.Serv
return true
}
case intstr.String:
for _, c := range address.Pod.Spec.Containers {
for _, c := range append(address.Pod.Spec.InitContainers, address.Pod.Spec.Containers...) {
for _, p := range c.Ports {
if p.ContainerPort == int32(address.Port) && p.Name == server.Spec.Port.StrVal {
return true
Expand Down Expand Up @@ -1550,7 +1550,7 @@ func SetToServerProtocol(k8sAPI *k8s.API, address *Address, log *logging.Entry)
portMatch = true
}
case intstr.String:
for _, c := range address.Pod.Spec.Containers {
for _, c := range append(address.Pod.Spec.InitContainers, address.Pod.Spec.Containers...) {
for _, p := range c.Ports {
if (p.ContainerPort == int32(address.Port) || p.HostPort == int32(address.Port)) &&
p.Name == server.Spec.Port.StrVal {
Expand Down