github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8366 from justinsb/idempotent_loadbalancer

Browse Source 
Make LoadBalancer creation more self-healing; don't delete on AWS
This commit is contained in:
Saad Ali
2015-08-20 14:30:55 -07:00
parent 85ee11afc0 907090a777
commit 5ec3c78190
13 changed files with 629 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/e2e/service.go
View File

@@ -586,21 +586,15 @@ var _ = Describe("Services", func() {
if len(service.Status.LoadBalancer.Ingress) != 1 {
Failf("got unexpected len(Status.LoadBalancer.Ingresss) for NodePort service: %v", service)
}
// TODO: Make this less of a hack. Watch for events?
Logf("Waiting 2 minutes to give service time to settle after changing configuration")
time.Sleep(time.Second * 120)
service, err = waitForLoadBalancerIngress(f.Client, serviceName, f.Namespace.Name)
Expect(err).NotTo(HaveOccurred())
ingress2 := service.Status.LoadBalancer.Ingress[0]
// TODO: Fix the issue here: http://issue.k8s.io/11002
if providerIs("aws") {
// TODO: Make this less of a hack (or fix the underlying bug)
time.Sleep(time.Second * 120)
service, err = waitForLoadBalancerIngress(f.Client, serviceName, f.Namespace.Name)
Expect(err).NotTo(HaveOccurred())
// We don't want the ingress point to change, but we should verify that the new ingress point still works
ingress2 = service.Status.LoadBalancer.Ingress[0]
Expect(ingress1).NotTo(Equal(ingress2))
} else {
Expect(ingress1).To(Equal(ingress2))
}
Expect(ingress1).To(Equal(ingress2))
By("hitting the pod through the service's updated NodePort")
testReachable(ip, nodePort2)