Remove default, return timeout error

Punt on what a sensible default value should be for the cache sync.
Return a `NewTimeoutError` when we timeout for cache sync.

Author: djzager

pkg/cache/informer_cache.go

@@ -58,11 +58,6 @@ func (ip *informerCache) Get(ctx context.Context, key client.ObjectKey, out runt
 		return err
 	}
 
-	ctx, cancelFunc := addTimeout(ctx)
-	if cancelFunc != nil {
-		defer cancelFunc()
-	}
-	cache, err := ip.InformersMap.Get(ctx, gvk, out)
 	started, cache, err := ip.InformersMap.Get(ctx, gvk, out)
 	if err != nil {
 		return err
@@ -107,10 +102,6 @@ func (ip *informerCache) List(ctx context.Context, out runtime.Object, opts ...c
 		}
 	}
 
-	ctx, cancelFunc := addTimeout(ctx)
-	if cancelFunc != nil {
-		defer cancelFunc()
-	}
 	started, cache, err := ip.InformersMap.Get(ctx, gvk, cacheTypeObj)
 	if err != nil {
 		return err
@@ -123,47 +114,29 @@ func (ip *informerCache) List(ctx context.Context, out runtime.Object, opts ...c
 	return cache.Reader.List(ctx, out, opts...)
 }
 
-// addTimeout adds a default 30 second timeout to a child contxt
-// if one does not exist.
-func addTimeout(ctx context.Context) (context.Context, context.CancelFunc) {
-	var cancelFunc context.CancelFunc
-	if _, ok := ctx.Deadline(); !ok {
-		ctx, cancelFunc = context.WithTimeout(ctx, 30*time.Second)
-	}
-	return ctx, cancelFunc
-}
-
 // GetInformerForKind returns the informer for the GroupVersionKind
-// Will timeout after 30 seconds if the informer is new and can not be
-// synced.
 func (ip *informerCache) GetInformerForKind(gvk schema.GroupVersionKind) (Informer, error) {
 	// Map the gvk to an object
 	obj, err := ip.Scheme.New(gvk)
 	if err != nil {
 		return nil, err
 	}
-	ctx, cancelFunc := addTimeout(context.TODO())
-	// There will never be a nil cancelFunc
-	defer cancelFunc()
-	_, i, err := ip.InformersMap.Get(ctx, gvk, obj)
+
+	_, i, err := ip.InformersMap.Get(context.TODO(), gvk, obj)
 	if err != nil {
 		return nil, err
 	}
 	return i.Informer, err
 }
 
 // GetInformer returns the informer for the obj
-// Will timeout after 30 seconds if the informer is new and can not be
-// synced.
 func (ip *informerCache) GetInformer(obj runtime.Object) (Informer, error) {
 	gvk, err := apiutil.GVKForObject(obj, ip.Scheme)
 	if err != nil {
 		return nil, err
 	}
-	ctx, cancelFunc := addTimeout(context.TODO())
-	// There will never be a nil cancelFunc
-	defer cancelFunc()
-	_, i, err := ip.InformersMap.Get(ctx, gvk, obj)
+
+	_, i, err := ip.InformersMap.Get(context.TODO(), gvk, obj)
 	if err != nil {
 		return nil, err
 	}

pkg/cache/internal/informers_map.go

@@ -22,6 +22,7 @@ import (
 	"sync"
 	"time"
 
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -174,7 +175,7 @@ func (ip *specificInformersMap) Get(ctx context.Context, gvk schema.GroupVersion
 		case <-ctx.Done():
 			//end the polling for cache to sync
 			done <- struct{}{}
-			return started, nil, fmt.Errorf("timeout waiting for %T Informer to sync", obj)
+			return started, nil, apierrors.NewTimeoutError(fmt.Sprintf("timeout waiting for %T Informer to sync", obj), 0)
 		case syncSuccess := <-syncReturn:
 			if !syncSuccess {
 				return started, nil, fmt.Errorf("failed waiting for %T Informer to sync", obj)