Update pkg/cache/internal/informers.go

maxsmythe · sbueringer · web-flow · commit 1247a4df58da · 2023-08-17T18:51:47.000-07:00
Co-authored-by: Stefan Büringer &lt;4662360+sbueringer@users.noreply.github.com&gt;
diff --git a/pkg/cache/internal/informers.go b/pkg/cache/internal/informers.go
@@ -271,7 +271,7 @@ func (ip *Informers) Get(ctx context.Context, gvk schema.GroupVersionKind, obj r
 		shouldBlock = *cfg.BlockUntilSynced
 	}
 
-	if started && !i.Informer.HasSynced() && shouldBlock {
+	if shouldBlock && started && !i.Informer.HasSynced() {
 		// Wait for it to sync before returning the Informer so that folks don't read from a stale cache.
 		if !cache.WaitForCacheSync(ctx.Done(), i.Informer.HasSynced) {
 			return started, nil, apierrors.NewTimeoutError(fmt.Sprintf("failed waiting for %T Informer to sync", obj), 0)

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ func (ip *Informers) Get(ctx context.Context, gvk schema.GroupVersionKind, obj r`
`271`	`271`	`shouldBlock = *cfg.BlockUntilSynced`
`272`	`272`	`}`
`273`	`273`
`274`		`- if started && !i.Informer.HasSynced() && shouldBlock {`
	`274`	`+ if shouldBlock && started && !i.Informer.HasSynced() {`
`275`	`275`	`// Wait for it to sync before returning the Informer so that folks don't read from a stale cache.`
`276`	`276`	`if !cache.WaitForCacheSync(ctx.Done(), i.Informer.HasSynced) {`
`277`	`277`	`return started, nil, apierrors.NewTimeoutError(fmt.Sprintf("failed waiting for %T Informer to sync", obj), 0)`