Skip to content

K
k3s
Commit ed1f2d75 authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Deflake services e2e

Picking a nodePort needs to be more robust than "add one to an existing port and hope it works". Now we try all ports in the range if we have to.
parent f1f250c6
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 8 deletions
test/e2e/service.go
View file @ ed1f2d75
...@@ -504,15 +504,22 @@ var _ = Describe("Services", func() { ...@@ -504,15 +504,22 @@ var _ = Describe("Services", func() {
By("hitting the pod through the service's LoadBalancer") By("hitting the pod through the service's LoadBalancer")
testLoadBalancerReachable(ingress1, 80) testLoadBalancerReachable(ingress1, 80)
By("changing service " + serviceName + " update NodePort") By("changing service " + serviceName + ": update NodePort")
nodePort2 := nodePort1 - 1 nodePort2 := 0
if !ServiceNodePortRange.Contains(nodePort2) { for i := 1; i < ServiceNodePortRange.Size; i++ {
//Check for (unlikely) assignment at bottom of range offs1 := nodePort1 - ServiceNodePortRange.Base
nodePort2 = nodePort1 + 1 offs2 := (offs1 + i) % ServiceNodePortRange.Size
nodePort2 := ServiceNodePortRange.Base + offs2
service, err = updateService(f.Client, f.Namespace.Name, serviceName, func(s *api.Service) {
s.Spec.Ports[0].NodePort = nodePort2
})
if err != nil && strings.Contains(err.Error(), "provided port is already allocated") {
Logf("nodePort %d is busy, will retry", nodePort2)
continue
}
// Otherwise err was nil or err was a real error
break
} }
service, err = updateService(f.Client, f.Namespace.Name, serviceName, func(s *api.Service) {
s.Spec.Ports[0].NodePort = nodePort2
})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
if service.Spec.Type != api.ServiceTypeLoadBalancer { if service.Spec.Type != api.ServiceTypeLoadBalancer {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment