Skip to content

Commit 3de459f

Browse files
committed
Revert "tls: Defer profile manager initialization until informer sync"
This reverts commit 97a5bd2.
1 parent 5c694c6 commit 3de459f

2 files changed

Lines changed: 5 additions & 21 deletions

File tree

pkg/cvo/cvo.go

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,7 @@ type Operator struct {
138138
apiServerLister configlistersv1.APIServerLister
139139
cacheSynced []cache.InformerSynced
140140

141-
apiServerInformer configinformersv1.APIServerInformer
142-
tlsOverrides *cvotls.Settings
143-
profileMgr *cvotls.ProfileManager
141+
profileMgr *cvotls.ProfileManager
144142

145143
// queue tracks applying updates to a cluster.
146144
queue workqueue.TypedRateLimitingInterface[any]
@@ -322,10 +320,6 @@ func New(
322320
optr.apiServerLister = apiServerInformer.Lister()
323321
optr.cacheSynced = append(optr.cacheSynced, apiServerInformer.Informer().HasSynced)
324322

325-
// Store for deferred TLS profile manager initialization (after informer sync)
326-
optr.apiServerInformer = apiServerInformer
327-
optr.tlsOverrides = overrides
328-
329323
// make sure this is initialized after all the listers are initialized
330324
riskSourceCallback := func() { optr.availableUpdatesQueue.Add(optr.queueKey()) }
331325

@@ -379,18 +373,13 @@ func New(
379373
},
380374
)
381375

382-
return optr, nil
383-
}
384-
385-
// InitializeProfileManager initializes the TLS profile manager.
386-
// Must be called after informers are started and synced.
387-
func (optr *Operator) InitializeProfileManager() error {
388-
profileMgr, err := cvotls.NewProfileManager(optr.apiServerInformer, optr.tlsOverrides)
376+
profileMgr, err := cvotls.NewProfileManager(apiServerInformer, overrides)
389377
if err != nil {
390-
return fmt.Errorf("failed to initialize TLS profile manager: %w", err)
378+
return nil, fmt.Errorf("failed to initialize TLS profile manager: %w", err)
391379
}
392380
optr.profileMgr = profileMgr
393-
return nil
381+
382+
return optr, nil
394383
}
395384

396385
// LoadInitialPayload waits until a ClusterVersion object exists. It then retrieves the payload contents, verifies the

pkg/start/start.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,6 @@ func (o *Options) run(ctx context.Context, controllerCtx *Context, lock resource
364364
}
365365
}
366366

367-
// Initialize TLS profile manager after informers are synced
368-
if err := controllerCtx.CVO.InitializeProfileManager(); err != nil {
369-
klog.Fatalf("Failed to initialize TLS profile manager: %v", err)
370-
}
371-
372367
resultChannelCount++
373368
go func() {
374369
defer utilruntime.HandleCrash()

0 commit comments

Comments
 (0)