Merge pull request #1895 from weaveworks/no-k8s-needed-to-mount-endpo…

…ints

Make namespace cache mockable when starting server

cmd/gitops-server/cmd/cmd.go

@@ -20,6 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/weaveworks/weave-gitops/api/v1alpha1"
 	"github.com/weaveworks/weave-gitops/cmd/gitops/cmderrors"
+	corecache "github.com/weaveworks/weave-gitops/core/cache"
 	"github.com/weaveworks/weave-gitops/core/logger"
 	core "github.com/weaveworks/weave-gitops/core/server"
 	"github.com/weaveworks/weave-gitops/pkg/helm/watcher"
@@ -203,7 +204,12 @@ func runCmd(cmd *cobra.Command, args []string) error {
 		authServer = srv
 	}
 
-	coreConfig := core.NewCoreConfig(log, rest, clusterName)
+	cache, err := corecache.NewContainer(context.Background(), rest, log)
+	if err != nil {
+		return fmt.Errorf("could not create cache container: %w", err)
+	}
+
+	coreConfig := core.NewCoreConfig(log, rest, cache, clusterName)
 
 	appConfig, err := server.DefaultApplicationsConfig(log)
 	if err != nil {

core/cache/container.go

@@ -10,20 +10,30 @@ import (
 	"k8s.io/client-go/rest"
 )
 
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
+
 const (
 	NamespaceStorage StorageType = "namespace"
 )
 
 type StorageType string
 
-type Container struct {
+//counterfeiter:generate . Container
+type Container interface {
+	Start(ctx context.Context)
+	Stop()
+	ForceRefresh(name StorageType)
+	Namespaces() map[string][]v1.Namespace
+}
+
+type container struct {
 	namespace namespaceStore
 	logger    logr.Logger
 }
 
-var globalCacheContainer *Container
+var globalCacheContainer Container
 
-func NewContainer(ctx context.Context, restCfg *rest.Config, logger logr.Logger) (*Container, error) {
+func NewContainer(ctx context.Context, restCfg *rest.Config, logger logr.Logger) (Container, error) {
 	if globalCacheContainer != nil {
 		return globalCacheContainer, nil
 	}
@@ -33,34 +43,34 @@ func NewContainer(ctx context.Context, restCfg *rest.Config, logger logr.Logger)
 		return nil, err
 	}
 
-	globalCacheContainer = &Container{
+	globalCacheContainer = &container{
 		namespace: newNamespaceStore(clusterClient, logger),
 		logger:    logger,
 	}
 
 	return globalCacheContainer, nil
 }
 
-func GlobalContainer() *Container {
+func GlobalContainer() Container {
 	return globalCacheContainer
 }
 
-func (c *Container) Start(ctx context.Context) {
+func (c *container) Start(ctx context.Context) {
 	c.namespace.Start(ctx)
 }
 
-func (c *Container) Stop() {
+func (c *container) Stop() {
 	c.namespace.Stop()
 }
 
-func (c *Container) ForceRefresh(name StorageType) {
+func (c *container) ForceRefresh(name StorageType) {
 	switch name {
 	case NamespaceStorage:
 		c.namespace.ForceRefresh()
 	}
 }
 
-func (c *Container) Namespaces() map[string][]v1.Namespace {
+func (c *container) Namespaces() map[string][]v1.Namespace {
 	return c.namespace.Namespaces()
 }
 

core/clustersmngr/clustersmngr.go

@@ -55,6 +55,7 @@ type ClusterFetcher interface {
 }
 
 // ClientsPool stores all clients to the leaf clusters
+//counterfeiter:generate . ClientsPool
 type ClientsPool interface {
 	Add(cfg ClusterClientConfig, cluster Cluster) error
 	Clients() map[string]ClusterClient