Skip to content

fix oidc flakiness #8119

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
arkodg merged 3 commits into from
Jan 30, 2026
Merged

fix oidc flakiness #8119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d6e70b
fix oidc flakiness
zhaohuabing Jan 29, 2026
6f26455
fix oidc flakiness
zhaohuabing Jan 29, 2026
0dbd28d
add comment
zhaohuabing Jan 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
31 changes: 0 additions & 31 deletions test/e2e/tests/oidc-backendcluster.go
View file
Open in desktop

This file was deleted.

31 changes: 14 additions & 17 deletions test/e2e/tests/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,19 @@ var OIDCTest = suite.ConformanceTest{
Description: "Test OIDC authentication",
Manifests: []string{"testdata/oidc-keycloak.yaml"},
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
ns := "gateway-conformance-infra"
podInitialized := corev1.PodCondition{Type: corev1.PodInitialized, Status: corev1.ConditionTrue}
// Wait for the keycloak pod to be configured with the test user and client
WaitForPods(t, suite.Client, ns, map[string]string{"job-name": "setup-keycloak"}, corev1.PodSucceeded, &podInitialized)
// Apply the security policy after the keycloak pod is ready, this is because EG will try to fetch the
// OIDC configuration from the keycloak's well-known endpoint
suite.Applier.MustApplyWithCleanup(t, suite.Client, suite.TimeoutConfig, "testdata/oidc-securitypolicy.yaml", true)

t.Run("oidc provider represented by a URL", func(t *testing.T) {
testOIDC(t, suite, "testdata/oidc-securitypolicy.yaml")
})

t.Run("oidc bypass", func(t *testing.T) {
ns := "gateway-conformance-infra"

podInitialized := corev1.PodCondition{Type: corev1.PodInitialized, Status: corev1.ConditionTrue}
// Wait for the keycloak pod to be configured with the test user and client
WaitForPods(t, suite.Client, ns, map[string]string{"job-name": "setup-keycloak"}, corev1.PodSucceeded, &podInitialized)

// Apply the security policy that configures OIDC authentication
suite.Applier.MustApplyWithCleanup(t, suite.Client, suite.TimeoutConfig, "testdata/oidc-securitypolicy.yaml", true)

routeWithOIDCNN := types.NamespacedName{Name: "http-with-oidc", Namespace: ns}
routeWithoutOIDCNN := types.NamespacedName{Name: "http-without-oidc", Namespace: ns}
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
Expand Down Expand Up @@ -114,6 +113,12 @@ var OIDCTest = suite.ConformanceTest{
})
}
})

// Apply the security policy that configures OIDC authentication with BackendCluster
suite.Applier.MustApplyWithCleanup(t, suite.Client, suite.TimeoutConfig, "testdata/oidc-securitypolicy-backendcluster.yaml", true)
t.Run("oidc provider represented by a BackendCluster", func(t *testing.T) {
testOIDC(t, suite, "testdata/oidc-securitypolicy-backendcluster.yaml")
})
},
}

Expand All @@ -125,14 +130,6 @@ func testOIDC(t *testing.T, suite *suite.ConformanceTestSuite, securityPolicyMan
sp = "oidc-test"
ns = "gateway-conformance-infra"
)

podInitialized := corev1.PodCondition{Type: corev1.PodInitialized, Status: corev1.ConditionTrue}
// Wait for the keycloak pod to be configured with the test user and client
WaitForPods(t, suite.Client, ns, map[string]string{"job-name": "setup-keycloak"}, corev1.PodSucceeded, &podInitialized)

// Apply the security policy that configures OIDC authentication
suite.Applier.MustApplyWithCleanup(t, suite.Client, suite.TimeoutConfig, securityPolicyManifest, true)

routeNN := types.NamespacedName{Name: route, Namespace: ns}
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
httpGWAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN, "http"), routeNN)
Expand Down