[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>
This commit is contained in:
Steve Huff
2019-07-17 01:59:35 -07:00
committed by Kubernetes Prow Robot
parent f7e6feba76
commit 2af95ff410
4 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: datadog
version: 1.31.8
version: 1.31.9
appVersion: 6.10.1
description: DataDog Agent
keywords:
+2 -2
View File
@@ -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
@@ -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 -}}
+2 -2
View File
@@ -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