From 1b562af18dc16cce116d0bc07e1a53e63c4edebc Mon Sep 17 00:00:00 2001 From: Ilias Rinis Date: Tue, 14 Oct 2025 11:35:45 +0200 Subject: [PATCH 1/2] manifests: remove oauth-openshift from expected versions This will prevent the CVO to consider it an expected version at all times, which breaks when OIDC is configured and that version does not exist anymore. --- manifests/08_clusteroperator.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifests/08_clusteroperator.yaml b/manifests/08_clusteroperator.yaml index 90ccb636ae..75ac7e6e2a 100644 --- a/manifests/08_clusteroperator.yaml +++ b/manifests/08_clusteroperator.yaml @@ -49,5 +49,3 @@ status: versions: - name: operator version: "0.0.1-snapshot" - - name: oauth-openshift - version: "0.0.1-snapshot_openshift" From f64ab6dd0fe96bb664028f0c080748b43a4eef4b Mon Sep 17 00:00:00 2001 From: Ilias Rinis Date: Tue, 14 Oct 2025 11:36:19 +0200 Subject: [PATCH 2/2] drop! pull fix from #798 --- pkg/operator/starter.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go index 8b3f0d2908..ffc180b166 100644 --- a/pkg/operator/starter.go +++ b/pkg/operator/starter.go @@ -476,6 +476,10 @@ func prepareOauthAPIServerOperator( const apiServerConditionsPrefix = "APIServer" + statusControllerOptions = append(statusControllerOptions, func(ss *status.StatusSyncer) *status.StatusSyncer { + return ss.WithVersionRemoval() + }) + apiServerControllers, err := apiservercontrollerset.NewAPIServerControllerSet( "oauth-apiserver", authOperatorInput.authenticationOperatorClient,