Skip to content

CNTRLPLANE-945: OIDC/enable skipped tests #30087

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
sdodson merged 1 commit into from
Aug 13, 2025
Merged

CNTRLPLANE-945: OIDC/enable skipped tests #30087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 22 additions & 31 deletions test/extended/authentication/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,12 @@ var _ = g.Describe("[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow]
o.Expect(apiServerArgs["authentication-config"].([]interface{})[0].(string)).To(o.Equal("/etc/kubernetes/static-pod-resources/configmaps/auth-config/auth-config.json"))
})

g.It("[Skipped] should remove the OpenShift OAuth stack", func() {
g.Skip("functionality not yet implemented")
/*
o.Eventually(func(gomega o.Gomega) {
_, err := oc.AdminKubeClient().AppsV1().Deployments("openshift-authentication").Get(ctx, "oauth-openshift", metav1.GetOptions{})
gomega.Expect(err).NotTo(o.BeNil(), "should not be able to get the integrated oauth stack")
gomega.Expect(apierrors.IsNotFound(err)).To(o.BeTrue(), "integrated oauth stack should not be present when OIDC authentication is configured")
}).WithTimeout(20 * time.Minute).WithPolling(30 * time.Second).Should(o.Succeed())
*/
g.It("should remove the OpenShift OAuth stack", func() {
o.Eventually(func(gomega o.Gomega) {
_, err := oc.AdminKubeClient().AppsV1().Deployments("openshift-authentication").Get(ctx, "oauth-openshift", metav1.GetOptions{})
gomega.Expect(err).NotTo(o.BeNil(), "should not be able to get the integrated oauth stack")
gomega.Expect(apierrors.IsNotFound(err)).To(o.BeTrue(), "integrated oauth stack should not be present when OIDC authentication is configured")
}).WithTimeout(5 * time.Minute).WithPolling(10 * time.Second).Should(o.Succeed())
})

g.It("should not accept tokens provided by the OAuth server", func() {
Expand Down Expand Up @@ -332,32 +329,26 @@ var _ = g.Describe("[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow]
})
})

g.Describe("[Skipped] with invalid specified UID or Extra claim mappings", func() {
g.Describe("with invalid specified UID or Extra claim mappings", func() {
g.It("should reject admission when UID claim expression is not compilable CEL", func() {
g.Skip("functionality not yet implemented")
/*
_, _, err := configureOIDCAuthentication(ctx, oc, func(o *configv1.OIDCProvider) {
o.ClaimMappings.UID = &configv1.TokenClaimOrExpressionMapping{
Expression: "!@&*#^",
}
})
o.Expect(err).To(o.HaveOccurred(), "should encounter an error configuring OIDC authentication")
*/
_, _, err := configureOIDCAuthentication(ctx, oc, keycloakNamespace, func(o *configv1.OIDCProvider) {
o.ClaimMappings.UID = &configv1.TokenClaimOrExpressionMapping{
Expression: "!@&*#^",
}
})
o.Expect(err).To(o.HaveOccurred(), "should encounter an error configuring OIDC authentication")
})

g.It("should reject admission when Extra claim expression is not compilable CEL", func() {
g.Skip("functionality not yet implemented")
/*
_, _, err := configureOIDCAuthentication(ctx, oc, func(o *configv1.OIDCProvider) {
o.ClaimMappings.Extra = []configv1.ExtraMapping{
{
Key: "payload/test",
ValueExpression: "!@*&#^!@(*&^",
},
}
})
o.Expect(err).To(o.HaveOccurred(), "should encounter an error configuring OIDC authentication")
*/
_, _, err := configureOIDCAuthentication(ctx, oc, keycloakNamespace, func(o *configv1.OIDCProvider) {
o.ClaimMappings.Extra = []configv1.ExtraMapping{
{
Key: "payload/test",
ValueExpression: "!@*&#^!@(*&^",
},
}
})
o.Expect(err).To(o.HaveOccurred(), "should encounter an error configuring OIDC authentication")
})
})
})
Expand Down
8 changes: 4 additions & 4 deletions test/extended/util/annotate/generated/zz_generated.annotations.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions zz_generated.manifests/test-reporting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,6 @@ spec:
when enabled'
- featureGate: ExternalOIDC
tests:
- testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
[OCPFeatureGate:ExternalOIDC] external IdP is configured [Skipped] should
remove the OpenShift OAuth stack'
- testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
[OCPFeatureGate:ExternalOIDC] external IdP is configured should accept authentication
via a certificate-based kubeconfig (break-glass)'
Expand All @@ -351,6 +348,9 @@ spec:
- testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
[OCPFeatureGate:ExternalOIDC] external IdP is configured should not accept
tokens provided by the OAuth server'
- testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
[OCPFeatureGate:ExternalOIDC] external IdP is configured should remove the
OpenShift OAuth stack'
- testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
[OCPFeatureGate:ExternalOIDC] reverting to IntegratedOAuth should accept tokens
provided by the OpenShift OAuth server'
Expand All @@ -367,12 +367,12 @@ spec:
tests:
- testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is
configured [Skipped] with invalid specified UID or Extra claim mappings should
reject admission when Extra claim expression is not compilable CEL'
configured with invalid specified UID or Extra claim mappings should reject
admission when Extra claim expression is not compilable CEL'
- testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is
configured [Skipped] with invalid specified UID or Extra claim mappings should
reject admission when UID claim expression is not compilable CEL'
configured with invalid specified UID or Extra claim mappings should reject
admission when UID claim expression is not compilable CEL'
- testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is
configured with valid specified UID or Extra claim mappings checking cluster
Expand Down