Skip to content

Commit 4aa62f8

Browse files
committed
pkg/operator: wait for image registry config object cache sync
without this wait, the nodeca daemon controller would sometimes make the operator become Degraded. the azure stack cloud and image config controllers were showing errors when the operator pod started after an upgrade, so this also adds sync waits to those.
1 parent 8c08b64 commit 4aa62f8

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

pkg/operator/azurestackcloud.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ func NewAzureStackCloudController(
4141
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "AzureStackCloudController"),
4242
}
4343

44+
c.cachesToSync = append(c.cachesToSync, operatorClient.Informer().HasSynced)
45+
4446
if _, err := openshiftConfigInformer.Informer().AddEventHandler(c.eventHandler()); err != nil {
4547
return nil, err
4648
}

pkg/operator/imageconfig.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ func NewImageConfigController(
6464
imageStreamImportModeEnabled: imageStreamImportModeEnabled,
6565
}
6666

67+
icc.cachesToSync = append(icc.cachesToSync, operatorClient.Informer().HasSynced)
68+
6769
if _, err := serviceInformer.Informer().AddEventHandler(icc.eventHandler()); err != nil {
6870
return nil, err
6971
}

pkg/operator/nodecadaemon.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ func NewNodeCADaemonController(
5454
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "NodeCADaemonController"),
5555
}
5656

57+
c.cachesToSync = append(c.cachesToSync, operatorClient.Informer().HasSynced)
58+
5759
if _, err := daemonSetInformer.Informer().AddEventHandler(c.eventHandler()); err != nil {
5860
return nil, err
5961
}

0 commit comments

Comments
 (0)