Skip to content

Commit 0ed7394

Browse files
committed
wait for the TG to be healthy before cleanup any resource
1 parent aa893b5 commit 0ed7394

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

test/e2e/service/nlb_instance_target_test.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66
"strings"
7+
"time"
78

89
awssdk "github.com/aws/aws-sdk-go/aws"
910
. "github.com/onsi/ginkgo/v2"
@@ -207,6 +208,12 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
207208
})
208209
}, utils.PollTimeoutShort, utils.PollIntervalMedium).Should(BeTrue())
209210
})
211+
By("waiting for target group targets to be healthy", func() {
212+
nodeList, err := stack.GetWorkerNodes(ctx, tf)
213+
Expect(err).ToNot(HaveOccurred())
214+
err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList))
215+
Expect(err).NotTo(HaveOccurred())
216+
})
210217
})
211218
It("should create TLS listeners", func() {
212219
if len(tf.Options.CertificateARNs) == 0 {
@@ -269,6 +276,12 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
269276
return verifyLoadBalancerListenerCertificates(ctx, tf, lbARN, certs) == nil
270277
}, utils.PollTimeoutShort, utils.PollIntervalMedium).Should(BeTrue())
271278
})
279+
By("waiting for target group targets to be healthy", func() {
280+
nodeList, err := stack.GetWorkerNodes(ctx, tf)
281+
Expect(err).ToNot(HaveOccurred())
282+
err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList))
283+
Expect(err).NotTo(HaveOccurred())
284+
})
272285
})
273286
It("should enable proxy protocol v2", func() {
274287
By("deploying stack", func() {
@@ -299,6 +312,7 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
299312
"deregistration_delay.timeout_seconds": "120",
300313
})
301314
}, utils.PollTimeoutShort, utils.PollIntervalMedium).Should(BeTrue())
315+
time.Sleep(30 * time.Second)
302316
})
303317
})
304318
})
@@ -346,6 +360,12 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
346360
err = verifyTargetGroupNumRegistered(ctx, tf, tgARN, len(nodes))
347361
Expect(err).ToNot(HaveOccurred())
348362
})
363+
By("waiting for target group targets to be healthy", func() {
364+
nodeList, err := stack.GetWorkerNodes(ctx, tf)
365+
Expect(err).ToNot(HaveOccurred())
366+
err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList))
367+
Expect(err).NotTo(HaveOccurred())
368+
})
349369
})
350370
})
351371
})

test/e2e/service/nlb_ip_target_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,10 @@ var _ = Describe("k8s service reconciled by the aws load balancer", func() {
405405
})
406406
Expect(err).ToNot(HaveOccurred())
407407
})
408+
By("waiting for target group targets to be healthy", func() {
409+
err := waitUntilTargetsAreHealthy(ctx, tf, lbARN, int(numReplicas))
410+
Expect(err).NotTo(HaveOccurred())
411+
})
408412
})
409413
})
410414
})

0 commit comments

Comments
 (0)