engine: hide "cache is not started" errors from uiresource/uisession (#…

…4669)
tilt-dev · Jun 22, 2021 · 925fc7b · 925fc7b
1 parent 25b7097
commit 925fc7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/internal/engine/uiresource/subscriber.go b/internal/engine/uiresource/subscriber.go
@@ -3,11 +3,11 @@ package uiresource
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/tilt-dev/tilt/internal/controllers/apicmp"
@@ -52,7 +52,7 @@ func (s *Subscriber) OnChange(ctx context.Context, st store.RStore, summary stor
 	if err != nil {
 		// If the cache hasn't started yet, that's OK.
 		// We'll get it on the next OnChange()
-		if strings.Contains(err.Error(), "cache not started") {
+		if _, ok := err.(*cache.ErrCacheNotStarted); ok {
 			return nil
 		}
 

diff --git a/internal/engine/uisession/subscriber.go b/internal/engine/uisession/subscriber.go
@@ -5,6 +5,7 @@ import (
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/tilt-dev/tilt/internal/controllers/apicmp"
@@ -42,6 +43,12 @@ func (s *Subscriber) OnChange(ctx context.Context, st store.RStore, summary stor
 		}
 		return nil
 	} else if err != nil {
+		// If the cache hasn't started yet, that's OK.
+		// We'll get it on the next OnChange()
+		if _, ok := err.(*cache.ErrCacheNotStarted); ok {
+			return nil
+		}
+
 		logger.Get(ctx).Infof("fetching uisession: %v", err)
 		return nil
 	}