Merge pull request openshift#917 from pecameron/bz1506378

Fix the check for "pod has HostPorts"
sjenning · Oct 26, 2017 · a66f627 · a66f627
2 parents 363ae75 + 1b56ebe
commit a66f627
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/pkg/sdn/plugin/pod.go b/pkg/sdn/plugin/pod.go
@@ -155,6 +155,15 @@ func (m *podManager) getPod(request *cniserver.PodRequest) *kubehostport.PodPort
  return nil
 }
 
+func hasHostPorts(pod *kubehostport.PodPortMapping) bool {
+ for _, mapping := range pod.PortMappings {
+ if mapping.HostPort != 0 {
+ return true
+ }
+ }
+ return false
+}
+
 // Return a list of Kubernetes RunningPod objects for hostport operations
 func (m *podManager) shouldSyncHostports(newPod *kubehostport.PodPortMapping) []*kubehostport.PodPortMapping {
  if m.hostportSyncer == nil {
@@ -165,11 +174,11 @@ func (m *podManager) shouldSyncHostports(newPod *kubehostport.PodPortMapping) []
  mappings := make([]*kubehostport.PodPortMapping, 0)
  for _, runningPod := range m.runningPods {
  mappings = append(mappings, runningPod.podPortMapping)
- if !newActiveHostports && len(runningPod.podPortMapping.PortMappings) > 0 {
+ if !newActiveHostports && hasHostPorts(runningPod.podPortMapping) {
  newActiveHostports = true
  }
  }
- if newPod != nil && len(newPod.PortMappings) > 0 {
+ if newPod != nil && hasHostPorts(newPod) {
  newActiveHostports = true
  }