github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27141 from freehan/hpfix 

Automatic merge from submit-queue

only handled non host network pods for hostports in kubenet

attempt to fix: #27118
pull/6/head
k8s-merge-robot 2016-06-09 22:08:10 -07:00 committed by GitHub
parent 1cfa84c1e1 1b2386f1ce
commit 805a0aae71
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/network/kubenet/kubenet_linux.go
View File

@ -613,7 +613,8 @@ func (plugin *kubenetNetworkPlugin) gatherAllHostports() (map[api.ContainerPort]
} }
// Need the complete api.Pod object // Need the complete api.Pod object
pod, ok := plugin.host.GetPodByName(p.Namespace, p.Name) pod, ok := plugin.host.GetPodByName(p.Namespace, p.Name)
if ok { // kubenet should not handle hostports for hostnetwork pods
if ok && !pod.Spec.SecurityContext.HostNetwork {
for _, container := range pod.Spec.Containers { for _, container := range pod.Spec.Containers {
for _, port := range container.Ports { for _, port := range container.Ports {
if port.HostPort != 0 { if port.HostPort != 0 {