From 5a730db05b7edd791e1182b5d588fd2a084929f8 Mon Sep 17 00:00:00 2001
From: Sophie Zhao <sophiezhao@microsoft.com>
Date: Thu, 13 May 2021 15:15:29 -0400
Subject: [PATCH] include helm collector feature flag

---
 cmd/aks-periscope/aks-periscope.go | 25 +++++++++++++++++--------
 deployment/aks-periscope.yaml      | 12 +++++++++++-
 tests/helm_test.go                 |  3 +--
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/cmd/aks-periscope/aks-periscope.go b/cmd/aks-periscope/aks-periscope.go
index aa36bb39..c224e1b9 100644
--- a/cmd/aks-periscope/aks-periscope.go
+++ b/cmd/aks-periscope/aks-periscope.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"log"
+	"os"
 	"strings"
 	"sync"
 
@@ -22,25 +23,33 @@ func main() {
 		log.Printf("Failed to create CRD: %+v", err)
 	}
 
+	clusterType := os.Getenv("CLUSTER_TYPE")
+
 	collectors := []interfaces.Collector{}
 	containerLogsCollector := collector.NewContainerLogsCollector(exporter)
 	collectors = append(collectors, containerLogsCollector)
-	systemLogsCollector := collector.NewSystemLogsCollector(exporter)
-	collectors = append(collectors, systemLogsCollector)
 	networkOutboundCollector := collector.NewNetworkOutboundCollector(5, exporter)
 	collectors = append(collectors, networkOutboundCollector)
-	ipTablesCollector := collector.NewIPTablesCollector(exporter)
-	collectors = append(collectors, ipTablesCollector)
-	nodeLogsCollector := collector.NewNodeLogsCollector(exporter)
-	collectors = append(collectors, nodeLogsCollector)
 	dnsCollector := collector.NewDNSCollector(exporter)
 	collectors = append(collectors, dnsCollector)
 	kubeObjectsCollector := collector.NewKubeObjectsCollector(exporter)
 	collectors = append(collectors, kubeObjectsCollector)
+	systemLogsCollector := collector.NewSystemLogsCollector(exporter)
+	ipTablesCollector := collector.NewIPTablesCollector(exporter)
+	nodeLogsCollector := collector.NewNodeLogsCollector(exporter)
 	kubeletCmdCollector := collector.NewKubeletCmdCollector(exporter)
-	collectors = append(collectors, kubeletCmdCollector)
 	systemPerfCollector := collector.NewSystemPerfCollector(exporter)
-	collectors = append(collectors, systemPerfCollector)
+	helmCollector := collector.NewHelmCollector(exporter)
+
+	if strings.EqualFold(clusterType, "connectedCluster") {
+		collectors = append(collectors, helmCollector)
+	} else {
+		collectors = append(collectors, systemLogsCollector)
+		collectors = append(collectors, ipTablesCollector)
+		collectors = append(collectors, nodeLogsCollector)
+		collectors = append(collectors, kubeletCmdCollector)
+		collectors = append(collectors, systemPerfCollector)
+	}
 
 	for _, c := range collectors {
 		waitgroup.Add(1)
diff --git a/deployment/aks-periscope.yaml b/deployment/aks-periscope.yaml
index eee2561a..99041d2b 100644
--- a/deployment/aks-periscope.yaml
+++ b/deployment/aks-periscope.yaml
@@ -80,6 +80,8 @@ spec:
             name: kubeobjects-config
         - configMapRef:
             name: nodelogs-config
+        - configMapRef:
+            name: clustertype-config
         - secretRef:
             name: azureblob-secret
         volumeMounts:
@@ -132,6 +134,14 @@ metadata:
 data:
   DIAGNOSTIC_NODELOGS_LIST: /var/log/azure/cluster-provision.log /var/log/cloud-init.log
 ---
+apiVersion: v1 
+kind: ConfigMap 
+metadata:
+  name: clustertype-config
+  namespace: aks-periscope
+data:
+  CLUSTER_TYPE: managedCluster
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -159,4 +169,4 @@ spec:
     singular: diagnostic
     kind: Diagnostic
     shortNames:
-    - apd
+    - apd
\ No newline at end of file
diff --git a/tests/helm_test.go b/tests/helm_test.go
index 319174bc..adf2c1de 100644
--- a/tests/helm_test.go
+++ b/tests/helm_test.go
@@ -1,4 +1,4 @@
-package tests
+package main
 
 import (
 	"fmt"
@@ -8,7 +8,6 @@ import (
 )
 
 func TestHelm(t *testing.T) {
-
 	output, err := utils.RunCommandOnContainer("helm", "list", "--all-namespaces")
 	if err != nil {
 		t.Errorf("Error: %s", err)