Skip to content

NO-JIRA: oidc: ensure console and cli OIDC clients are available when enabling OIDC #30406

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

NO-JIRA: oidc: ensure console and cli OIDC clients are available when enabling OIDC #30406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9f1897
oidc: ensure console and cli OIDC clients are available when enabling…
everettraven Oct 21, 2025
58ac6f2
oidc: add cli oidcclient
everettraven Oct 22, 2025
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
30 changes: 30 additions & 0 deletions test/extended/authentication/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/util/errors"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -116,6 +117,7 @@ var _ = g.Describe("[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow]
o.Expect(err).NotTo(o.HaveOccurred(), "should not encounter an error configuring OIDC authentication")

waitForRollout(ctx, oc)
waitForHealthyOIDCClients(ctx, oc)
})

g.Describe("external IdP is configured", g.Ordered, func() {
Expand Down Expand Up @@ -283,6 +285,7 @@ var _ = g.Describe("[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow]
o.Expect(err).NotTo(o.HaveOccurred(), "should not encounter an error configuring OIDC authentication")

waitForRollout(ctx, oc)
waitForHealthyOIDCClients(ctx, oc)
})

g.It("should default UID to the 'sub' claim in the access token from the IdP", func() {
Expand Down Expand Up @@ -322,6 +325,7 @@ var _ = g.Describe("[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow]
o.Expect(err).NotTo(o.HaveOccurred(), "should not encounter an error configuring OIDC authentication")

waitForRollout(ctx, oc)
waitForHealthyOIDCClients(ctx, oc)
})

g.Describe("checking cluster identity mapping", g.Ordered, func() {
Expand Down Expand Up @@ -485,6 +489,14 @@ func generateOIDCProvider(ctx context.Context, client *exutil.CLI, namespace, oi
Name: oidcClientSecret,
},
},
{
ComponentName: "cli",
ComponentNamespace: "openshift-console",
ClientID: "openshift-cli-oidc-client",
ClientSecret: configv1.SecretNameReference{
Name: oidcClientSecret,
},
},
},
}, nil
}
Expand Down Expand Up @@ -601,3 +613,21 @@ func checkKubeAPIServerCondition(ctx context.Context, kasCli operatorv1client.Ku

return nil
}

func waitForHealthyOIDCClients(ctx context.Context, client *exutil.CLI) {
o.Eventually(func(gomega o.Gomega) {
authn, err := client.AdminConfigClient().ConfigV1().Authentications().Get(ctx, "cluster", metav1.GetOptions{})
gomega.Expect(err).NotTo(o.HaveOccurred())

for _, client := range authn.Status.OIDCClients {
// ignore clients that aren't OpenShift default clients
if client.ComponentNamespace != "openshift-console" && !(client.ComponentName == "console" || client.ComponentName == "cli") {
continue
}

availableCondition := meta.FindStatusCondition(client.Conditions, "Available")
gomega.Expect(availableCondition).NotTo(o.BeNil(), fmt.Sprintf("oidc client %s/%s should have an Available condition", client.ComponentNamespace, client.ComponentName))
gomega.Expect(availableCondition.Status).To(o.Equal(metav1.ConditionTrue), fmt.Sprintf("oidc client %s/%s should be available but was not", client.ComponentNamespace, client.ComponentName), availableCondition)
}
}).WithTimeout(10*time.Minute).WithPolling(20*time.Second).Should(o.Succeed(), "should eventually have healthy OIDC client configurations")
}