Get correct leader election holder ID in upgrade test

ciarams87 · ciarams87 · commit e1f63cd36c52 · 2024-05-20T15:29:01.000+01:00
diff --git a/tests/suite/upgrade_test.go b/tests/suite/upgrade_test.go
@@ -208,11 +208,12 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {
 			500*time.Millisecond,
 			true, /* poll immediately */
 			func(_ context.Context) (bool, error) {
+				defer GinkgoRecover()
 				Expect(k8sClient.Get(leaseCtx, key, &lease)).To(Succeed())
 
 				if lease.Spec.HolderIdentity != nil {
 					for _, podName := range podNames {
-						if podName == *lease.Spec.HolderIdentity {
+						if podName == strings.Split(*lease.Spec.HolderIdentity, "_")[0] {
 							return true, nil
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -208,11 +208,12 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {`
`208`	`208`	`500*time.Millisecond,`
`209`	`209`	`true, /* poll immediately */`
`210`	`210`	`func(_ context.Context) (bool, error) {`
	`211`	`+ defer GinkgoRecover()`
`211`	`212`	`Expect(k8sClient.Get(leaseCtx, key, &lease)).To(Succeed())`
`212`	`213`
`213`	`214`	`if lease.Spec.HolderIdentity != nil {`
`214`	`215`	`for _, podName := range podNames {`
`215`		`- if podName == *lease.Spec.HolderIdentity {`
	`216`	`+ if podName == strings.Split(*lease.Spec.HolderIdentity, "_")[0] {`
`216`	`217`	`return true, nil`
`217`	`218`	`}`
`218`	`219`	`}`