Skip to content

Fix Flaky results on Library and Gateway controller test #2039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 3 commits into from
Jun 29, 2026
+45 −14
Merged

Fix Flaky results on Library and Gateway controller test #2039

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1006c36
Fix Flaky results on Library and Gateway controller test
fjglira Jun 26, 2026
a40edbd
Adding change from code sreview copilot
fjglira Jun 29, 2026
087f2a9
Fix flaky result when validates ValidateConnectivity
fjglira Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions tests/e2e/gatewaycontroller/gateway_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"istio.io/istio/pkg/ptr"
Expand Down Expand Up @@ -215,10 +216,20 @@ spec:
})

It("curl client pod is ready", func(ctx SpecContext) {
Eventually(func() error {
return common.CheckPodsReady(ctx, cl, gatewayNamespace)
// Check only the curl-client pod
Eventually(func(g Gomega) {
pod := &corev1.Pod{}
g.Expect(cl.Get(ctx, kube.Key("curl-client", gatewayNamespace), pod)).To(Succeed())
var ready bool
for _, cond := range pod.Status.Conditions {
if cond.Type == corev1.PodReady && cond.Status == corev1.ConditionTrue {
ready = true
break
}
}
g.Expect(ready).To(BeTrue(), "curl-client pod is not ready")
}).Should(Succeed())
Success("All pods in gateway namespace are ready")
Success("Curl client pod is ready")

@fjglira fjglira Jun 26, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to check if this work, because now we are only validating that curl pod is running, but the previous step validates that all the gateway deploy are Ready

})
})

Expand Down
16 changes: 11 additions & 5 deletions tests/e2e/library/library_reconcile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,12 +275,18 @@ var _ = Describe("Library Reconciliation", Label("library", "reconciliation"), O
webhookKey := types.NamespacedName{
Name: fmt.Sprintf("istio-validator-%s-%s", revision, namespace),
}
webhook := &admissionv1.ValidatingWebhookConfiguration{}
Expect(cl.Get(ctx, webhookKey, webhook)).To(Succeed())

webhook.Webhooks[0].Name = "xyz.xyz.xyz"
webhook.Webhooks[0].FailurePolicy = ptr.Of(admissionv1.Fail)
Expect(cl.Update(ctx, webhook)).To(Succeed())
// Refresh and retry: the background reconciler may update the webhook
// concurrently (causing a 409 conflict on Update) or transiently clear
// the Webhooks list, so we assert rather than index directly.
Eventually(func(g Gomega) {
webhook := &admissionv1.ValidatingWebhookConfiguration{}
g.Expect(cl.Get(ctx, webhookKey, webhook)).To(Succeed())
g.Expect(webhook.Webhooks).NotTo(BeEmpty(), "webhook has no entries")
webhook.Webhooks[0].Name = "xyz.xyz.xyz"
webhook.Webhooks[0].FailurePolicy = ptr.Of(admissionv1.Fail)
g.Expect(cl.Update(ctx, webhook)).To(Succeed())
}).Should(Succeed())

Eventually(func(g Gomega) {
restored := &admissionv1.ValidatingWebhookConfiguration{}
Expand Down
Loading