Collect pod labels and support reading them via API (#70)

otterize · Feb 10, 2023 · 62aeb13 · 62aeb13
1 parent 8633f5b
commit 62aeb13
Show file tree

Hide file tree

Showing 9 changed files with 361 additions and 90 deletions.
diff --git a/src/mapper/cmd/main.go b/src/mapper/cmd/main.go
@@ -78,13 +78,7 @@ func main() {
 	defer cancelFn()
 	mgr.GetCache().WaitForCacheSync(initCtx) // needed to let the manager initialize before used in intentsHolder
 
-	intentHolderCfg, err := resolvers.IntentsHolderConfigFromViper()
-	if err != nil {
-		logrus.Error(intentHolderCfg)
-		os.Exit(1)
-	}
-
-	intentsHolder := resolvers.NewIntentsHolder(mgr.GetClient(), intentHolderCfg)
+	intentsHolder := resolvers.NewIntentsHolder(mgr.GetClient())
 
 	resolver := resolvers.NewResolver(kubeFinder, serviceidresolver.NewResolver(mgr.GetClient()), intentsHolder)
 	resolver.Register(e)

diff --git a/src/mapper/pkg/clouduploader/cloud_uploader_test.go b/src/mapper/pkg/clouduploader/cloud_uploader_test.go
@@ -6,7 +6,6 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
 	cloudclientmocks "github.com/otterize/network-mapper/src/mapper/pkg/cloudclient/mocks"
-	"github.com/otterize/network-mapper/src/mapper/pkg/config"
 	"github.com/otterize/network-mapper/src/mapper/pkg/graph/model"
 	"github.com/otterize/network-mapper/src/mapper/pkg/resolvers"
 	"github.com/samber/lo"
@@ -29,7 +28,7 @@ type CloudUploaderTestSuite struct {
 
 func (s *CloudUploaderTestSuite) SetupTest() {
 	s.testNamespace = "test-namespace"
-	s.intentsHolder = resolvers.NewIntentsHolder(nil, resolvers.IntentsHolderConfig{StoreConfigMap: config.StoreConfigMapDefault, Namespace: s.testNamespace})
+	s.intentsHolder = resolvers.NewIntentsHolder(nil)
 }
 
 func (s *CloudUploaderTestSuite) BeforeTest(_, testName string) {

diff --git a/src/mapper/pkg/config/config.go b/src/mapper/pkg/config/config.go
@@ -12,8 +12,6 @@ const (
 	ClusterDomainDefault         = kubeutils.DefaultClusterDomain
 	DebugKey                     = "debug"
 	DebugDefault                 = false
-	StoreConfigMapKey            = "store-config-map"
-	StoreConfigMapDefault        = "otterize-network-mapper-store"
 	NamespaceKey                 = "namespace"
 	CloudApiAddrKey              = "api-address"
 	CloudApiAddrDefault          = "https://app.otterize.com/api"
@@ -26,7 +24,6 @@ const (
 func init() {
 	viper.SetDefault(DebugKey, DebugDefault)
 	viper.SetDefault(ClusterDomainKey, ClusterDomainDefault) // If not set by the user, the main.go of mapper will try to find the cluster domain and set it itself.
-	viper.SetDefault(StoreConfigMapKey, StoreConfigMapDefault)
 	viper.SetDefault(CloudApiAddrKey, CloudApiAddrDefault)
 	viper.SetDefault(UploadIntervalSecondsKey, UploadIntervalSecondsDefault)
 	viper.SetEnvPrefix(EnvPrefix)