Set default for Istio collection to disabled

Author: orishoshan

src/mapper/cmd/main.go

@@ -225,15 +225,17 @@ func main() {
 		logrus.WithError(err).Panic("Failed to initialize cloud client")
 	}
 
-	istioWatcher, err := istiowatcher.NewWatcher(resolver.Mutation())
-	if err != nil {
-		logrus.WithError(err).Panic("failed to initialize istio watcher")
-	}
+	if viper.GetBool(config.EnableIstioCollectionKey) {
+		istioWatcher, err := istiowatcher.NewWatcher(resolver.Mutation())
+		if err != nil {
+			logrus.WithError(err).Panic("failed to initialize istio watcher")
+		}
 
-	errgrp.Go(func() error {
-		defer errorreporter.AutoNotify()
-		return istioWatcher.RunForever(errGroupCtx)
-	})
+		errgrp.Go(func() error {
+			defer errorreporter.AutoNotify()
+			return istioWatcher.RunForever(errGroupCtx)
+		})
+	}
 
 	cloudUploaderConfig := clouduploader.ConfigFromViper()
 	if cloudEnabled {

src/mapper/pkg/config/config.go

@@ -35,6 +35,8 @@ const (
 	DNSClientIntentsUpdateEnabledKey      = "dns-client-intents-update-enabled"
 	DNSClientIntentsUpdateEnabledDefault  = false
 
+	EnableIstioCollectionKey           = "enable-istio-collection"
+	EnableIstioCollectionDefault       = false
 	IstioRestrictCollectionToNamespace = "istio-restrict-collection-to-namespace"
 	IstioReportIntervalKey             = "istio-report-interval"
 	IstioReportIntervalDefault         = 30 * time.Second
@@ -68,5 +70,6 @@ func init() {
 	viper.SetDefault(MetricFetchTimeoutKey, MetricFetchTimeoutDefault)
 	viper.SetDefault(IstioCooldownIntervalKey, IstioCooldownIntervalDefault)
 	viper.SetDefault(IstioRestrictCollectionToNamespace, "")
+	viper.SetDefault(EnableIstioCollectionKey, EnableIstioCollectionDefault)
 	excludedNamespaces = goset.FromSlice(viper.GetStringSlice(ExcludedNamespacesKey))
 }