github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2198 from claire921/service

Browse Source 
Service
This commit is contained in:
Tim Hockin 2014-11-07 11:15:29 -08:00
commit b4b6453808
2 changed files with 106 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/service/endpoints_controller.go
View File

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

115
pkg/service/endpoints_controller_test.go
View File

@ -79,45 +79,86 @@ func TestFindPort(t *testing.T) {
}, },
}, },
} }
port, err := findPort(&manifest, util.IntOrString{Kind: util.IntstrString, StrVal: "foo"}) emptyPortsManifest := api.ContainerManifest{
if err != nil { Containers: []api.Container{
t.Errorf("unexpected error: %v", err) {
Ports: []api.Port{},
},
},
} }
if port != 8080 { tests := []struct {
t.Errorf("Expected 8080, Got %d", port) manifest api.ContainerManifest
portName util.IntOrString
wport int
werr bool
}{
{
manifest,
util.IntOrString{Kind: util.IntstrString, StrVal: "foo"},
8080,
false,
},
{
manifest,
util.IntOrString{Kind: util.IntstrString, StrVal: "bar"},
8000,
false,
},
{
manifest,
util.IntOrString{Kind: util.IntstrInt, IntVal: 8000},
8000,
false,
},
{
manifest,
util.IntOrString{Kind: util.IntstrInt, IntVal: 7000},
7000,
false,
},
{
manifest,
util.IntOrString{Kind: util.IntstrString, StrVal: "baz"},
0,
true,
},
{
manifest,
util.IntOrString{Kind: util.IntstrString, StrVal: ""},
8080,
false,
},
{
manifest,
util.IntOrString{Kind: util.IntstrInt, IntVal: 0},
8080,
false,
},
{
emptyPortsManifest,
util.IntOrString{Kind: util.IntstrString, StrVal: ""},
0,
true,
},
{
emptyPortsManifest,
util.IntOrString{Kind: util.IntstrInt, IntVal: 0},
0,
true,
},
} }
port, err = findPort(&manifest, util.IntOrString{Kind: util.IntstrString, StrVal: "bar"}) for _, test := range tests {
if err != nil { port, err := findPort(&test.manifest, test.portName)
t.Errorf("unexpected error: %v", err) if port != test.wport {
} t.Errorf("Expected port %d, Got %d", test.wport, port)
if port != 8000 { }
t.Errorf("Expected 8000, Got %d", port) if err == nil && test.werr {
} t.Errorf("unexpected non-error")
port, err = findPort(&manifest, util.IntOrString{Kind: util.IntstrInt, IntVal: 8000}) }
if port != 8000 { if err != nil && test.werr == false {
t.Errorf("Expected 8000, Got %d", port) t.Errorf("unexpected error: %v", err)
} }
port, err = findPort(&manifest, util.IntOrString{Kind: util.IntstrInt, IntVal: 7000})
if port != 7000 {
t.Errorf("Expected 7000, Got %d", port)
}
port, err = findPort(&manifest, util.IntOrString{Kind: util.IntstrString, StrVal: "baz"})
if err == nil {
t.Error("unexpected non-error")
}
port, err = findPort(&manifest, util.IntOrString{Kind: util.IntstrString, StrVal: ""})
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if port != 8080 {
t.Errorf("Expected 8080, Got %d", port)
}
port, err = findPort(&manifest, util.IntOrString{})
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if port != 8080 {
t.Errorf("Expected 8080, Got %d", port)
} }
} }