From 41ea7e7d99d1475afe0737164e814e232844e462 Mon Sep 17 00:00:00 2001
From: Clint Moyer <contact@clintmoyer.com>
Date: Fri, 5 Apr 2019 10:59:21 -0600
Subject: [PATCH] [stable/filebeat] Move beat-exporter containerPort into
 context block (#12769)

* Move beat-exporter containerPort into context block

Fixes #12768 where beat-exporter containerPort remains in
daemonset template when beat-exporter service is disabled.

Signed-off-by: Clint Moyer <contact@clintmoyer.com>

* Bump filebeat to version 1.5.2

Signed-off-by: Clint Moyer <contact@clintmoyer.com>
---
 stable/filebeat/Chart.yaml               | 2 +-
 stable/filebeat/templates/daemonset.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stable/filebeat/Chart.yaml b/stable/filebeat/Chart.yaml
index da4bc09f36..496af83a7f 100644
--- a/stable/filebeat/Chart.yaml
+++ b/stable/filebeat/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Helm chart to collect Kubernetes logs with filebeat
 icon: https://www.elastic.co/assets/blt47799dcdcf08438d/logo-elastic-beats-lt.svg
 name: filebeat
-version: 1.5.1
+version: 1.5.2
 appVersion: 6.7.0
 home: https://www.elastic.co/products/beats/filebeat
 sources:
diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
index 2b8e2657ca..b7466cfa14 100644
--- a/stable/filebeat/templates/daemonset.yaml
+++ b/stable/filebeat/templates/daemonset.yaml
@@ -123,10 +123,10 @@ spec:
 {{- if .Values.monitoring.resources }}
         resources:
 {{ toYaml .Values.monitoring.resources | indent 10 }}
-{{- end }}
 {{- end }}
         ports:
           - containerPort: {{ .Values.monitoring.exporterPort}}
+{{- end }}
       volumes:
       - name: varlog
         hostPath: