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

fix error in findPortByName

Browse Source 
using ContainerPort instead of HostPort
This commit is contained in:
xiejunan 2015-08-14 10:06:59 +08:00
parent ea59172874
commit f5446f2aa3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/prober/prober.go
View File

@ -255,7 +255,7 @@ func extractPort(param util.IntOrString, container api.Container) (int, error) {
func findPortByName(container api.Container, portName string) (int, error) { func findPortByName(container api.Container, portName string) (int, error) {
for _, port := range container.Ports { for _, port := range container.Ports {
if port.Name == portName { if port.Name == portName {
return port.HostPort, nil return port.ContainerPort, nil
} }
} }
return 0, fmt.Errorf("port %s not found", portName) return 0, fmt.Errorf("port %s not found", portName)

12
pkg/kubelet/prober/prober_test.go
View File

@ -48,12 +48,12 @@ func TestFindPortByName(t *testing.T) {
container := api.Container{ container := api.Container{
Ports: []api.ContainerPort{ Ports: []api.ContainerPort{
{ {
Name: "foo", Name: "foo",
HostPort: 8080, ContainerPort: 8080,
}, },
{ {
Name: "bar", Name: "bar",
HostPort: 9000, ContainerPort: 9000,
}, },
}, },
} }
@ -85,7 +85,7 @@ func TestGetURLParts(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
state := api.PodStatus{PodIP: "127.0.0.1"} state := api.PodStatus{PodIP: "127.0.0.1"}
container := api.Container{ container := api.Container{
Ports: []api.ContainerPort{{Name: "found", HostPort: 93}}, Ports: []api.ContainerPort{{Name: "found", ContainerPort: 93}},
LivenessProbe: &api.Probe{ LivenessProbe: &api.Probe{
Handler: api.Handler{ Handler: api.Handler{
HTTPGet: test.probe, HTTPGet: test.probe,
@ -138,7 +138,7 @@ func TestGetTCPAddrParts(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
host := "1.2.3.4" host := "1.2.3.4"
container := api.Container{ container := api.Container{
Ports: []api.ContainerPort{{Name: "found", HostPort: 93}}, Ports: []api.ContainerPort{{Name: "found", ContainerPort: 93}},
LivenessProbe: &api.Probe{ LivenessProbe: &api.Probe{
Handler: api.Handler{ Handler: api.Handler{
TCPSocket: test.probe, TCPSocket: test.probe,