github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix nodeport repair for ESIPP services

Browse Source
This commit is contained in:
Nick Sardo 2018-05-25 16:09:16 -07:00
parent 5782d476c5
commit c05e89d0e5
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/core/service/portallocator/controller/repair.go
View File

@ -204,5 +204,10 @@ func collectServiceNodePorts(service *api.Service) []int {
servicePorts = append(servicePorts, int(servicePort.NodePort)) servicePorts = append(servicePorts, int(servicePort.NodePort))
} }
} }
if service.Spec.HealthCheckNodePort != 0 {
servicePorts = append(servicePorts, int(service.Spec.HealthCheckNodePort))
}
return servicePorts return servicePorts
} }

10
pkg/registry/core/service/portallocator/controller/repair_test.go
View File

@ -164,6 +164,12 @@ func TestRepairWithExisting(t *testing.T) {
Ports: []api.ServicePort{{NodePort: 111}}, Ports: []api.ServicePort{{NodePort: 111}},
}, },
}, },
&api.Service{
ObjectMeta: metav1.ObjectMeta{Namespace: "six", Name: "six"},
Spec: api.ServiceSpec{
HealthCheckNodePort: 144,
},
},
) )
registry := &mockRangeRegistry{ registry := &mockRangeRegistry{
@ -183,10 +189,10 @@ func TestRepairWithExisting(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !after.Has(111) || !after.Has(122) || !after.Has(133) { if !after.Has(111) || !after.Has(122) || !after.Has(133) || !after.Has(144) {
t.Errorf("unexpected portallocator state: %#v", after) t.Errorf("unexpected portallocator state: %#v", after)
} }
if free := after.Free(); free != 98 { if free := after.Free(); free != 97 {
t.Errorf("unexpected portallocator state: %d free", free) t.Errorf("unexpected portallocator state: %d free", free)
} }
} }