github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Tim Hockin
2015-05-19 10:17:53 -07:00
parent c7bf373d98
commit 711fa2f2c6
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/api/validation/validation.go
View File

@@ -673,9 +673,9 @@ func validateProbe(probe *api.Probe) errs.ValidationErrorList {
return allErrs return allErrs
} }
// accumulateUniquePorts runs an extraction function on each Port of each Container, // AccumulateUniqueHostPorts extracts each HostPort of each Container,
// accumulating the results and returning an error if any ports conflict. // accumulating the results and returning an error if any ports conflict.
func accumulateUniqueHostPorts(containers []api.Container, accumulator map[string]bool) errs.ValidationErrorList { func AccumulateUniqueHostPorts(containers []api.Container, accumulator *util.StringSet) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{} allErrs := errs.ValidationErrorList{}
for ci, ctr := range containers { for ci, ctr := range containers {
@@ -686,10 +686,10 @@ func accumulateUniqueHostPorts(containers []api.Container, accumulator map[strin
continue continue
} }
str := fmt.Sprintf("%d/%s", port, ctr.Ports[pi].Protocol) str := fmt.Sprintf("%d/%s", port, ctr.Ports[pi].Protocol)
if accumulator[str] { if accumulator.Has(str) {
cErrs = append(cErrs, errs.NewFieldDuplicate("port", str)) cErrs = append(cErrs, errs.NewFieldDuplicate("port", str))
} else { } else {
accumulator[str] = true accumulator.Insert(str)
} }
} }
allErrs = append(allErrs, cErrs.PrefixIndex(ci)...) allErrs = append(allErrs, cErrs.PrefixIndex(ci)...)
@@ -697,11 +697,11 @@ func accumulateUniqueHostPorts(containers []api.Container, accumulator map[strin
return allErrs return allErrs
} }
// ValidateHostPorts checks for colliding Port.HostPort values across // checkHostPortConflicts checks for colliding Port.HostPort values across
// a slice of containers. // a slice of containers.
func ValidateHostPorts(containers []api.Container) errs.ValidationErrorList { func checkHostPortConflicts(containers []api.Container) errs.ValidationErrorList {
allPorts := map[string]bool{} allPorts := util.StringSet{}
return accumulateUniqueHostPorts(containers, allPorts) return AccumulateUniqueHostPorts(containers, &allPorts)
} }
func validateExecAction(exec *api.ExecAction) errs.ValidationErrorList { func validateExecAction(exec *api.ExecAction) errs.ValidationErrorList {
@@ -818,7 +818,7 @@ func validateContainers(containers []api.Container, volumes util.StringSet) errs
allErrs = append(allErrs, cErrs.PrefixIndex(i)...) allErrs = append(allErrs, cErrs.PrefixIndex(i)...)
} }
// Check for colliding ports across all containers. // Check for colliding ports across all containers.
allErrs = append(allErrs, ValidateHostPorts(containers)...) allErrs = append(allErrs, checkHostPortConflicts(containers)...)
return allErrs return allErrs
} }

4
pkg/kubelet/kubelet.go
View File

@@ -1354,11 +1354,13 @@ func (s podsByCreationTime) Less(i, j int) bool {
// checkHostPortConflicts detects pods with conflicted host ports. // checkHostPortConflicts detects pods with conflicted host ports.
func checkHostPortConflicts(pods []*api.Pod) (fitting []*api.Pod, notFitting []*api.Pod) { func checkHostPortConflicts(pods []*api.Pod) (fitting []*api.Pod, notFitting []*api.Pod) {
ports := util.StringSet{}
// Respect the pod creation order when resolving conflicts. // Respect the pod creation order when resolving conflicts.
sort.Sort(podsByCreationTime(pods)) sort.Sort(podsByCreationTime(pods))
for _, pod := range pods { for _, pod := range pods {
if errs := validation.ValidateHostPorts(pod.Spec.Containers); len(errs) != 0 { if errs := validation.AccumulateUniqueHostPorts(pod.Spec.Containers, &ports); len(errs) != 0 {
glog.Errorf("Pod %q: HostPort is already allocated, ignoring: %v", kubecontainer.GetPodFullName(pod), errs) glog.Errorf("Pod %q: HostPort is already allocated, ignoring: %v", kubecontainer.GetPodFullName(pod), errs)
notFitting = append(notFitting, pod) notFitting = append(notFitting, pod)
continue continue