Skip to content

Commit de9f965

Browse files
committed
fixup! common: add helper func to determine whether OIDC is enabled on KAS pods
1 parent 641d1dd commit de9f965

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

pkg/controllers/common/external_oidc.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ func ExternalOIDCConfigAvailable(authLister configv1listers.AuthenticationLister
3737
observedRevisions.Insert(nodeStatus.CurrentRevision)
3838
}
3939

40+
if observedRevisions.Len() == 0 {
41+
return false, nil
42+
}
43+
4044
for _, revision := range observedRevisions.UnsortedList() {
4145
// ensure every observed revision includes an auth-config revisioned configmap
4246
_, err := cmLister.ConfigMaps("openshift-kube-apiserver").Get(fmt.Sprintf("auth-config-%d", revision))

pkg/controllers/common/external_oidc_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ func TestExternalOIDCConfigAvailable(t *testing.T) {
2828
expectAvailable bool
2929
expectError bool
3030
}{
31+
{
32+
name: "no node statuses observed",
33+
authType: configv1.AuthenticationTypeOIDC,
34+
expectAvailable: false,
35+
expectError: false,
36+
},
3137
{
3238
name: "oidc disabled, no rollout",
3339
configMaps: []*corev1.ConfigMap{cm("config-10", "config.yaml", kasConfigJSONWithoutOIDC)},

0 commit comments

Comments
 (0)