Skip to content

NO-JIRA: externaloidc: return errors when node statuses cannot be used to determine oidc state #801

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: master
Choose a base branch
from
+53 −3
Open

NO-JIRA: externaloidc: return errors when node statuses cannot be used to determine oidc state #801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d280bd
externaloidc: return errors when node statuses cannot be used to dete…
liouk Oct 16, 2025
702bf57
DO-NOT-MERGE: add debug logging
liouk Nov 3, 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
17 changes: 15 additions & 2 deletions pkg/controllers/common/external_oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,26 @@ func (c *AuthConfigChecker) OIDCAvailable() (bool, error) {
return false, fmt.Errorf("getting kubeapiservers.operator.openshift.io/cluster: %v", err)
}

if len(kas.Status.NodeStatuses) == 0 {
return false, fmt.Errorf("determining observed revisions in kubeapiservers.operator.openshift.io/cluster; no node statuses found")
}

observedRevisions := sets.New[int32]()
nodesWithEmptyRevision := false
for _, nodeStatus := range kas.Status.NodeStatuses {
observedRevisions.Insert(nodeStatus.CurrentRevision)
if nodeStatus.CurrentRevision > 0 {
observedRevisions.Insert(nodeStatus.CurrentRevision)
} else {
nodesWithEmptyRevision = true
}
}

if nodesWithEmptyRevision {
return false, fmt.Errorf("determining observed revisions in kubeapiservers.operator.openshift.io/cluster; some nodes do not have a valid CurrentRevision")
Comment on lines 76 to 87
Copy link
Contributor

@everettraven everettraven Oct 24, 2025

Choose a reason for hiding this comment

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

If we find one with an invalid revision, should we just return the error from within the loop, terminating it early?

As-is, I don't really see us gaining any benefit of continuing to loop once we've found at least one node with an invalid current revision.

Suggested change
nodesWithEmptyRevision := false
for _, nodeStatus := range kas.Status.NodeStatuses {
observedRevisions.Insert(nodeStatus.CurrentRevision)
if nodeStatus.CurrentRevision > 0 {
observedRevisions.Insert(nodeStatus.CurrentRevision)
} else {
nodesWithEmptyRevision = true
}
}
if nodesWithEmptyRevision {
return false, fmt.Errorf("determining observed revisions in kubeapiservers.operator.openshift.io/cluster; some nodes do not have a valid CurrentRevision")
for _, nodeStatus := range kas.Status.NodeStatuses {
if nodeStatus.CurrentRevision <= 0 {
return false, fmt.Errorf("determining observed revisions in kubeapiservers.operator.openshift.io/cluster; some nodes do not have a valid CurrentRevision")
}
observedRevisions.Insert(nodeStatus.CurrentRevision)
}

Copy link
Member Author

@liouk liouk Oct 27, 2025

Choose a reason for hiding this comment

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

Of course -- now that we don't use the count this is much better 👍

}

if observedRevisions.Len() == 0 {
return false, nil
return false, fmt.Errorf("determining observed revisions in kubeapiservers.operator.openshift.io/cluster; no observed revisions found")
}

for _, revision := range observedRevisions.UnsortedList() {
Expand Down
24 changes: 23 additions & 1 deletion pkg/controllers/common/external_oidc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,29 @@ func TestExternalOIDCConfigAvailable(t *testing.T) {
name: "no node statuses observed",
authType: configv1.AuthenticationTypeOIDC,
expectAvailable: false,
expectError: false,
expectError: true,
},
{
name: "some node revisions are zero",
authType: configv1.AuthenticationTypeOIDC,
nodeStatuses: []operatorv1.NodeStatus{
{CurrentRevision: 10},
{CurrentRevision: 10},
{CurrentRevision: 0},
},
expectAvailable: false,
expectError: true,
},
{
name: "node revisions are zero",
authType: configv1.AuthenticationTypeOIDC,
nodeStatuses: []operatorv1.NodeStatus{
{CurrentRevision: 0},
{CurrentRevision: 0},
{CurrentRevision: 0},
},
expectAvailable: false,
expectError: true,
},
{
name: "oidc disabled, no rollout",
Expand Down