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

Refactor findPort in service pkg

pull/6/head
Claire Li 2014-11-05 22:38:06 -08:00
parent b6956506fa
commit ea0c6bcbfd
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/service/endpoints_controller.go
View File

@ -138,21 +138,30 @@ func endpointsEqual(e *api.Endpoints, endpoints []string) bool {
// findPort locates the container port for the given manifest and portName.
func findPort(manifest *api.ContainerManifest, portName util.IntOrString) (int, error) {
if ((portName.Kind == util.IntstrString && len(portName.StrVal) == 0) ||
(portName.Kind == util.IntstrInt && portName.IntVal == 0)) &&
len(manifest.Containers[0].Ports) > 0 {
return manifest.Containers[0].Ports[0].ContainerPort, nil
firstContianerPort := -1
if len(manifest.Containers[0].Ports) > 0 {
firstContianerPort = manifest.Containers[0].Ports[0].ContainerPort
}
if portName.Kind == util.IntstrInt {
return portName.IntVal, nil
}
name := portName.StrVal
for _, container := range manifest.Containers {
for _, port := range container.Ports {
if port.Name == name {
return port.ContainerPort, nil
switch portName.Kind {
case util.IntstrString:
if len(portName.StrVal) == 0 && firstContianerPort != -1 {
return firstContianerPort, nil
}
name := portName.StrVal
for _, container := range manifest.Containers {
for _, port := range container.Ports {
if port.Name == name {
return port.ContainerPort, nil
}
}
}
case util.IntstrInt:
if portName.IntVal == 0 && firstContianerPort != -1 {
return firstContianerPort, nil
}
return portName.IntVal, nil
}
return -1, fmt.Errorf("no suitable port for manifest: %s", manifest.ID)
}