Skip to content

OTA-1836: Fix empty lister for API server (simplified a bit) #1397

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
hongkailiu wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −43
Open

OTA-1836: Fix empty lister for API server (simplified a bit) #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3de459f
Revert "tls: Defer profile manager initialization until informer sync"
hongkailiu Jun 1, 2026
a040ae4
Fix empty lister for API server
hongkailiu Jun 1, 2026
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
35 changes: 7 additions & 28 deletions pkg/cvo/cvo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ import (
overridesrisk "github.com/openshift/cluster-version-operator/pkg/risk/overrides"
updatingrisk "github.com/openshift/cluster-version-operator/pkg/risk/updating"
upgradeablerisk "github.com/openshift/cluster-version-operator/pkg/risk/upgradeable"
cvotls "github.com/openshift/cluster-version-operator/pkg/tls"
)

const (
Expand Down Expand Up @@ -135,12 +134,9 @@ type Operator struct {
cmConfigManagedLister listerscorev1.ConfigMapNamespaceLister
proxyLister configlistersv1.ProxyLister
featureGateLister configlistersv1.FeatureGateLister
apiServerLister configlistersv1.APIServerLister
cacheSynced []cache.InformerSynced

apiServerInformer configinformersv1.APIServerInformer
tlsOverrides *cvotls.Settings
profileMgr *cvotls.ProfileManager
applyTLSSettings func(config *tls.Config)

// queue tracks applying updates to a cluster.
queue workqueue.TypedRateLimitingInterface[any]
Expand Down Expand Up @@ -240,8 +236,7 @@ func New(
proxyInformer configinformersv1.ProxyInformer,
operatorInformerFactory operatorexternalversions.SharedInformerFactory,
featureGateInformer configinformersv1.FeatureGateInformer,
apiServerInformer configinformersv1.APIServerInformer,
overrides *cvotls.Settings,
applyTLSSettings func(config *tls.Config),
client clientset.Interface,
kubeClient kubernetes.Interface,
operatorClient operatorclientset.Interface,
Expand Down Expand Up @@ -292,6 +287,8 @@ func New(
enabledManifestFeatureGates: startingEnabledManifestFeatureGates,

alwaysEnableCapabilities: alwaysEnableCapabilities,

applyTLSSettings: applyTLSSettings,
}

if _, err := cvInformer.Informer().AddEventHandler(optr.clusterVersionEventHandler()); err != nil {
Expand Down Expand Up @@ -319,13 +316,6 @@ func New(
optr.featureGateLister = featureGateInformer.Lister()
optr.cacheSynced = append(optr.cacheSynced, featureGateInformer.Informer().HasSynced)

optr.apiServerLister = apiServerInformer.Lister()
optr.cacheSynced = append(optr.cacheSynced, apiServerInformer.Informer().HasSynced)

// Store for deferred TLS profile manager initialization (after informer sync)
optr.apiServerInformer = apiServerInformer
optr.tlsOverrides = overrides

// make sure this is initialized after all the listers are initialized
riskSourceCallback := func() { optr.availableUpdatesQueue.Add(optr.queueKey()) }

Expand Down Expand Up @@ -382,17 +372,6 @@ func New(
return optr, nil
}

// InitializeProfileManager initializes the TLS profile manager.
// Must be called after informers are started and synced.
func (optr *Operator) InitializeProfileManager() error {
profileMgr, err := cvotls.NewProfileManager(optr.apiServerInformer, optr.tlsOverrides)
if err != nil {
return fmt.Errorf("failed to initialize TLS profile manager: %w", err)
}
optr.profileMgr = profileMgr
return nil
}

// LoadInitialPayload waits until a ClusterVersion object exists. It then retrieves the payload contents, verifies the
// initial state and returns it. If the payload is invalid, an error is returned.
func (optr *Operator) LoadInitialPayload(ctx context.Context, restConfig *rest.Config) (*payload.Update, error) {
Expand Down Expand Up @@ -1245,7 +1224,7 @@ func (optr *Operator) shouldEnableProposalController() bool {
return optr.requiredFeatureSet == configv1.TechPreviewNoUpgrade
}

// ApplySettings returns the ApplySettings function of the TLS profile manager
func (optr *Operator) ApplySettings() func(config *tls.Config) {
return optr.profileMgr.ApplySettings
// ApplyTLSSettings returns the function that applies TLS settings to the TLS config
func (optr *Operator) ApplyTLSSettings() func(config *tls.Config) {
return optr.applyTLSSettings
}
25 changes: 10 additions & 15 deletions pkg/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ func (o *Options) Run(ctx context.Context) error {
}

clusterVersionConfigInformerFactory, configInformerFactory := o.prepareConfigInformerFactories(cb)
// This is to ensure that APIServers get loaded when configInformerFactory is started and synced in o.processInitialFeatureGate().
// It is important when creating TLS profile manager later.
configInformerFactory.Config().V1().APIServers().Lister()
startingFeatureSet, startingCvoGates, startingEnabledManifestFeatureGates, err := o.processInitialFeatureGate(ctx, configInformerFactory)
if err != nil {
return fmt.Errorf("error processing feature gates: %w", err)
Expand Down Expand Up @@ -357,18 +360,6 @@ func (o *Options) run(ctx context.Context, controllerCtx *Context, lock resource
}
}

configSynced := controllerCtx.ConfigInformerFactory.WaitForCacheSync(informersDone)
for _, synced := range configSynced {
if !synced {
klog.Fatalf("Caches never synchronized: %v", postMainContext.Err())
}
}

// Initialize TLS profile manager after informers are synced
if err := controllerCtx.CVO.InitializeProfileManager(); err != nil {
klog.Fatalf("Failed to initialize TLS profile manager: %v", err)
}

resultChannelCount++
go func() {
defer utilruntime.HandleCrash()
Expand All @@ -386,7 +377,7 @@ func (o *Options) run(ctx context.Context, controllerCtx *Context, lock resource
resultChannelCount++
go func() {
defer utilruntime.HandleCrash()
err := cvo.RunMetrics(postMainContext, shutdownContext, restConfig, controllerCtx.CVO.ApplySettings(), o.MetricsOptions)
err := cvo.RunMetrics(postMainContext, shutdownContext, restConfig, controllerCtx.CVO.ApplyTLSSettings(), o.MetricsOptions)
resultChannel <- asyncResult{name: "metrics server", error: err}
}()
}
Expand Down Expand Up @@ -652,6 +643,11 @@ func (o *Options) NewControllerContext(
}
rtClient := cb.RuntimeControllerClientOrDie("runtime-controller-client")

tlsProfileMgr, err := tls.NewProfileManager(configInformerFactory.Config().V1().APIServers(), o.TLSOptions.GetOverrides())
if err != nil {
return nil, fmt.Errorf("failed to initialize TLS profile manager: %w", err)
}

cvo, err := cvo.New(
o.NodeName,
o.Namespace, o.Name,
Expand All @@ -665,8 +661,7 @@ func (o *Options) NewControllerContext(
configInformerFactory.Config().V1().Proxies(),
operatorInformerFactory,
configInformerFactory.Config().V1().FeatureGates(),
configInformerFactory.Config().V1().APIServers(),
o.TLSOptions.GetOverrides(),
tlsProfileMgr.ApplySettings,
cb.ClientOrDie(o.Namespace),
cvoKubeClient,
operatorClient,
Expand Down