From 609d9ee1f0c7afd118b137b3de3efe8745adeb46 Mon Sep 17 00:00:00 2001
From: Naseem <naseem@transit.app>
Date: Wed, 27 Jan 2021 15:13:18 -0500
Subject: [PATCH] Fix agent default config override template (#25)

move `exporters` and `service.pipelines` into if statement to avoid
setting them to null when standalone is disabled

Signed-off-by: naseemkullah <naseem@transit.app>
---
 charts/opentelemetry-collector/Chart.yaml            | 2 +-
 charts/opentelemetry-collector/templates/_config.tpl | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml
index dfb8d228991..b2a60654515 100644
--- a/charts/opentelemetry-collector/Chart.yaml
+++ b/charts/opentelemetry-collector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.3.0
+version: 0.3.1
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/
diff --git a/charts/opentelemetry-collector/templates/_config.tpl b/charts/opentelemetry-collector/templates/_config.tpl
index f2f236d7f47..ebe6633124f 100644
--- a/charts/opentelemetry-collector/templates/_config.tpl
+++ b/charts/opentelemetry-collector/templates/_config.tpl
@@ -105,19 +105,19 @@ Get otel memory_limiter ballast_size_mib value based on 40% of resources.memory.
 Default config override for agent collector deamonset
 */}}
 {{- define "opentelemetry-collector.agentConfigOverride" -}}
+{{- if .Values.standaloneCollector.enabled }}
 exporters:
-  {{- if .Values.standaloneCollector.enabled }}
   otlp:
     endpoint: {{ include "opentelemetry-collector.fullname" . }}:55680
     insecure: true
-  {{- end }}
+{{- end }}
 
+{{- if .Values.standaloneCollector.enabled }}
 service:
   pipelines:
-    {{- if .Values.standaloneCollector.enabled }}
     metrics:
       exporters: [otlp]
     traces:
       exporters: [otlp]
-    {{- end }}
+{{- end }}
 {{- end }}