diff --git a/cmd/aks-periscope/aks-periscope.go b/cmd/aks-periscope/aks-periscope.go index c224e1b9..26fe6c17 100644 --- a/cmd/aks-periscope/aks-periscope.go +++ b/cmd/aks-periscope/aks-periscope.go @@ -27,13 +27,9 @@ func main() { collectors := []interfaces.Collector{} containerLogsCollector := collector.NewContainerLogsCollector(exporter) - collectors = append(collectors, containerLogsCollector) networkOutboundCollector := collector.NewNetworkOutboundCollector(5, exporter) - collectors = append(collectors, networkOutboundCollector) 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) @@ -42,8 +38,17 @@ func main() { helmCollector := collector.NewHelmCollector(exporter) if strings.EqualFold(clusterType, "connectedCluster") { + collectors = append(collectors, containerLogsCollector) + collectors = append(collectors, dnsCollector) collectors = append(collectors, helmCollector) + collectors = append(collectors, kubeObjectsCollector) + collectors = append(collectors, networkOutboundCollector) + } else { + collectors = append(collectors, containerLogsCollector) + collectors = append(collectors, dnsCollector) + collectors = append(collectors, kubeObjectsCollector) + collectors = append(collectors, networkOutboundCollector) collectors = append(collectors, systemLogsCollector) collectors = append(collectors, ipTablesCollector) collectors = append(collectors, nodeLogsCollector) diff --git a/deployment/aks-periscope.yaml b/deployment/aks-periscope.yaml index 99041d2b..a075574d 100644 --- a/deployment/aks-periscope.yaml +++ b/deployment/aks-periscope.yaml @@ -140,7 +140,7 @@ metadata: name: clustertype-config namespace: aks-periscope data: - CLUSTER_TYPE: managedCluster + CLUSTER_TYPE: # --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/pkg/collector/helm_collector.go b/pkg/collector/helm_collector.go index d8f808dc..674c3dab 100644 --- a/pkg/collector/helm_collector.go +++ b/pkg/collector/helm_collector.go @@ -30,7 +30,12 @@ func (collector *HelmCollector) Collect() error { return err } - output, err := utils.RunCommandOnContainer("curl", "-fsSl", "-o", "get_helm.sh", "https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3") + output, err := utils.RunCommandOnContainer("apk", "add", "curl", "openssl", "bash", "--no-cache") + if err != nil { + return err + } + + output, err = utils.RunCommandOnContainer("curl", "-fsSl", "-o", "get_helm.sh", "https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3") if err != nil { return err } diff --git a/tests/helm_test.go b/tests/helm_test.go deleted file mode 100644 index adf2c1de..00000000 --- a/tests/helm_test.go +++ /dev/null @@ -1,23 +0,0 @@ -package main - -import ( - "fmt" - "testing" - - "github.com/Azure/aks-periscope/pkg/utils" -) - -func TestHelm(t *testing.T) { - output, err := utils.RunCommandOnContainer("helm", "list", "--all-namespaces") - if err != nil { - t.Errorf("Error: %s", err) - } else { - fmt.Printf(output) - } - output, err = utils.RunCommandOnContainer("helm", "history", "-n", "default", "azure-arc") - if err != nil { - t.Errorf("Error: %s", err) - } else { - fmt.Printf(output) - } -}