From 2af95ff410bf28a68ec4dfca1607fc59872e9b99 Mon Sep 17 00:00:00 2001
From: Steve Huff <shuff@vecna.org>
Date: Wed, 17 Jul 2019 04:59:35 -0400
Subject: [PATCH] [stable/datadog] Fix whitespace trimming (#15577)

Using double-sided whitespace trimming (something like `{{- end -}}` can be
dangerous anywhere other than at the very beginning and the very end of a
template file, because it trims carriage returns.  This makes it possible to
inadvertently create a manifest like the following:

```yaml
apiVersion: "rbac.authorization.k8s.io/v1"
kind: ClusterRoleBinding
metadata:
  labels:
    app: "datadog"
    chart: "datadog-1.31.8"
    release: "datadog"
    heritage: "Tiller"
  name: datadog
roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
  name: datadog
subjects:
  - kind: ServiceAccount
    name: datadog
    namespace: datadog---
apiVersion: v1
kind: ServiceAccount
metadata:
  labels:
    app: "datadog"
    chart: "datadog-1.31.8"
    heritage: "Tiller"
    release: "datadog"
  name: datadog
---
```

Signed-off-by: Steve Huff <shuff@vecna.org>
---
 stable/datadog/Chart.yaml                     | 2 +-
 stable/datadog/templates/agent-rbac.yaml      | 4 ++--
 stable/datadog/templates/confd-configmap.yaml | 4 ++--
 stable/datadog/templates/rbac.yaml            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index fa1c49c52d..d72ac15a64 100755
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 1.31.8
+version: 1.31.9
 appVersion: 6.10.1
 description: DataDog Agent
 keywords:
diff --git a/stable/datadog/templates/agent-rbac.yaml b/stable/datadog/templates/agent-rbac.yaml
index a464ee3e08..40063453d6 100644
--- a/stable/datadog/templates/agent-rbac.yaml
+++ b/stable/datadog/templates/agent-rbac.yaml
@@ -98,9 +98,9 @@ metadata:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
   name: {{ template "datadog.fullname" . }}-cluster-agent
-{{- end -}}
+{{- end }}
 
-{{- if and .Values.rbac.create .Values.clusterAgent.enabled .Values.clusterAgent.metricsProvider.enabled -}}
+{{- if and .Values.rbac.create .Values.clusterAgent.enabled .Values.clusterAgent.metricsProvider.enabled }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/stable/datadog/templates/confd-configmap.yaml b/stable/datadog/templates/confd-configmap.yaml
index 98eebe0508..4d76edbd1a 100644
--- a/stable/datadog/templates/confd-configmap.yaml
+++ b/stable/datadog/templates/confd-configmap.yaml
@@ -18,8 +18,8 @@ override duplicates
 */}}
 {{- if .Values.datadog.autoconf }}
 {{ tpl (toYaml .Values.datadog.autoconf) . | indent 2 }}
-{{- end -}}
+{{- end }}
 {{- if .Values.datadog.confd }}
 {{ tpl (toYaml .Values.datadog.confd) . | indent 2 }}
-{{- end -}}
+{{- end }}
 {{- end -}}
diff --git a/stable/datadog/templates/rbac.yaml b/stable/datadog/templates/rbac.yaml
index 7a11daa8aa..a3e5c0a483 100644
--- a/stable/datadog/templates/rbac.yaml
+++ b/stable/datadog/templates/rbac.yaml
@@ -82,7 +82,7 @@ rules:
   verbs:
   - get
 ---
-{{- if not .Values.clusterchecksDeployment.rbac.dedicated -}}
+{{- if not .Values.clusterchecksDeployment.rbac.dedicated }}
 apiVersion: {{ template "rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
@@ -100,7 +100,7 @@ subjects:
   - kind: ServiceAccount
     name: {{ template "datadog.fullname" . }}
     namespace: {{ .Release.Namespace }}
-{{- end -}}
+{{- end }}
 ---
 apiVersion: v1
 kind: ServiceAccount