diff --git a/pkg/registry/apis/provisioning/controller/repository.go b/pkg/registry/apis/provisioning/controller/repository.go index 8a507b09b67..27ee5f9e0a1 100644 --- a/pkg/registry/apis/provisioning/controller/repository.go +++ b/pkg/registry/apis/provisioning/controller/repository.go @@ -41,13 +41,11 @@ type queueItem struct { // RepositoryController controls how and when CRD is established. type RepositoryController struct { - client client.ProvisioningV0alpha1Interface - resourceLister resources.ResourceLister - repoLister listers.RepositoryLister - repoSynced cache.InformerSynced - parsers resources.ParserFactory - logger logging.Logger - dualwrite dualwrite.Service + client client.ProvisioningV0alpha1Interface + repoLister listers.RepositoryLister + repoSynced cache.InformerSynced + logger logging.Logger + dualwrite dualwrite.Service jobs jobs.Queue finalizer *finalizer @@ -69,7 +67,6 @@ func NewRepositoryController( repoInformer informer.RepositoryInformer, repoFactory repository.Factory, resourceLister resources.ResourceLister, - parsers resources.ParserFactory, clients resources.ClientFactory, tester RepositoryTester, jobs jobs.Queue, @@ -78,10 +75,9 @@ func NewRepositoryController( statusPatcher StatusPatcher, ) (*RepositoryController, error) { rc := &RepositoryController{ - client: provisioningClient, - resourceLister: resourceLister, - repoLister: repoInformer.Lister(), - repoSynced: repoInformer.Informer().HasSynced, + client: provisioningClient, + repoLister: repoInformer.Lister(), + repoSynced: repoInformer.Informer().HasSynced, queue: workqueue.NewTypedRateLimitingQueueWithConfig( workqueue.DefaultTypedControllerRateLimiter[*queueItem](), workqueue.TypedRateLimitingQueueConfig[*queueItem]{ @@ -91,7 +87,6 @@ func NewRepositoryController( repoFactory: repoFactory, healthChecker: healthChecker, statusPatcher: statusPatcher, - parsers: parsers, finalizer: &finalizer{ lister: resourceLister, clientFactory: clients, @@ -291,7 +286,7 @@ func (rc *RepositoryController) determineSyncStrategy(ctx context.Context, obj * case !healthStatus.Healthy: logger.Info("skip sync for unhealthy repository") return nil - case dualwrite.IsReadingLegacyDashboardsAndFolders(ctx, rc.dualwrite): + case rc.dualwrite != nil && dualwrite.IsReadingLegacyDashboardsAndFolders(ctx, rc.dualwrite): logger.Info("skip sync as we are reading from legacy storage") return nil case healthStatus.Healthy != obj.Status.Health.Healthy: diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go index abc814697cf..0e2926ec138 100644 --- a/pkg/registry/apis/provisioning/register.go +++ b/pkg/registry/apis/provisioning/register.go @@ -758,7 +758,6 @@ func (b *APIBuilder) GetPostStartHooks() (map[string]genericapiserver.PostStartH repoInformer, b.repoFactory, b.resourceLister, - b.parsers, b.clients, &repository.Tester{}, b.jobs,