From 3a8c00764c343149635e1ad3d7ba6c10ec794d9c Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Tue, 20 Feb 2018 16:45:43 +0000
Subject: [PATCH] yaml cleanup: trim multiline strings

Change-Id: I7e8f423be2efb84f3116258beca805265ca388f7
---
 calico/templates/configmap-bin.yaml           |  6 +++---
 calico/templates/configmap-etc.yaml           | 20 +++++++++----------
 elasticsearch/templates/configmap-bin.yaml    |  2 +-
 elasticsearch/templates/configmap-etc.yaml    | 12 +++++------
 flannel/templates/configmap-bin.yaml          |  2 +-
 fluent-logging/templates/configmap-bin.yaml   |  2 +-
 fluent-logging/templates/configmap-etc.yaml   |  8 ++++----
 grafana/templates/configmap-bin.yaml          |  2 +-
 grafana/templates/configmap-etc.yaml          |  4 ++--
 kibana/templates/configmap-bin.yaml           |  2 +-
 kibana/templates/configmap-etc.yaml           |  6 +++---
 kube-dns/templates/configmap-bin.yaml         |  2 +-
 nfs-provisioner/templates/configmap-bin.yaml  |  2 +-
 .../templates/configmap-bin.yaml              |  2 +-
 .../templates/configmap-etc.yaml              |  4 ++--
 .../templates/configmap-bin.yaml              |  2 +-
 .../templates/configmap-bin.yaml              |  2 +-
 .../templates/configmap-bin.yaml              |  4 ++--
 prometheus/templates/configmap-bin.yaml       |  2 +-
 prometheus/templates/configmap-etc.yaml       |  4 ++--
 redis/templates/configmap-bin.yaml            |  2 +-
 registry/templates/configmap-bin.yaml         |  6 +++---
 registry/templates/configmap-etc.yaml         |  4 ++--
 tiller/templates/configmap-bin.yaml           |  2 +-
 24 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/calico/templates/configmap-bin.yaml b/calico/templates/configmap-bin.yaml
index 196db6740..9a6eff808 100644
--- a/calico/templates/configmap-bin.yaml
+++ b/calico/templates/configmap-bin.yaml
@@ -22,10 +22,10 @@ kind: ConfigMap
 metadata:
   name: calico-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
-  install-calicoctl.sh: |+
+  install-calicoctl.sh: |
 {{ tuple "bin/_install-calicoctl.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  calico-settings.sh: |+
+  calico-settings.sh: |
 {{ tuple "bin/_calico-settings.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end }}
diff --git a/calico/templates/configmap-etc.yaml b/calico/templates/configmap-etc.yaml
index b8aa4fffe..7549546dc 100644
--- a/calico/templates/configmap-etc.yaml
+++ b/calico/templates/configmap-etc.yaml
@@ -39,25 +39,25 @@ data:
   # we overlay templates found natively in the calico-node container so that we may override
   # bgp configuration
 
-  bird6.cfg.mesh.template: |+
+  bird6.cfg.mesh.template: |
 {{ tuple "etc/bird/_bird6.cfg.mesh.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bird6.cfg.no-mesh.template: |+
+  bird6.cfg.no-mesh.template: |
 {{ tuple "etc/bird/_bird6.cfg.no-mesh.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bird6_ipam.cfg.template: |+
+  bird6_ipam.cfg.template: |
 {{ tuple "etc/bird/_bird6_ipam.cfg.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bird_aggr.cfg.template: |+
+  bird_aggr.cfg.template: |
 {{ tuple "etc/bird/_bird_aggr.cfg.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bird.cfg.mesh.template: |+
+  bird.cfg.mesh.template: |
 {{ tuple "etc/bird/_bird.cfg.mesh.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bird.cfg.no-mesh.template: |+
+  bird.cfg.no-mesh.template: |
 {{ tuple "etc/bird/_bird.cfg.no-mesh.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bird_ipam.cfg.template: |+
+  bird_ipam.cfg.template: |
 {{ tuple "etc/bird/_bird_ipam.cfg.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  custom_filters6.cfg.template: |+
+  custom_filters6.cfg.template: |
 {{ tuple "etc/bird/_custom_filters6.cfg.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  custom_filters.cfg.template: |+
+  custom_filters.cfg.template: |
 {{ tuple "etc/bird/_custom_filters.cfg.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  tunl-ip.template: |+
+  tunl-ip.template: |
 {{ tuple "etc/bird/_tunl-ip.template.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 
   # The location of your etcd cluster.  This uses the Service clusterIP
diff --git a/elasticsearch/templates/configmap-bin.yaml b/elasticsearch/templates/configmap-bin.yaml
index d7db9a24e..585227498 100644
--- a/elasticsearch/templates/configmap-bin.yaml
+++ b/elasticsearch/templates/configmap-bin.yaml
@@ -32,6 +32,6 @@ data:
 {{ tuple "bin/_register-repository.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   curator.sh: |
 {{ tuple "bin/_curator.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/elasticsearch/templates/configmap-etc.yaml b/elasticsearch/templates/configmap-etc.yaml
index 8bfcefc61..f0c41a433 100644
--- a/elasticsearch/templates/configmap-etc.yaml
+++ b/elasticsearch/templates/configmap-etc.yaml
@@ -26,16 +26,16 @@ kind: ConfigMap
 metadata:
   name: elasticsearch-etc
 data:
-  httpd.conf: |+
+  httpd.conf: |
 {{- tuple .Values.conf.apache.httpd "etc/_httpd.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
-  elasticsearch-host.conf: |+
+  elasticsearch-host.conf: |
 {{- tuple .Values.conf.apache.host "etc/_elasticsearch-host.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
-  elasticsearch.yml: |+
+  elasticsearch.yml: |
 {{ toYaml .Values.conf.elasticsearch.config | indent 4 }}
-  log4j2.properties: |+
+  log4j2.properties: |
 {{- tuple .Values.conf.elasticsearch "etc/_log4j2.properties.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
-  action_file.yml: |+
+  action_file.yml: |
 {{ toYaml .Values.conf.curator.action_file | indent 4 }}
-  config.yml: |+
+  config.yml: |
 {{ toYaml .Values.conf.curator.config | indent 4 }}
 {{- end }}
diff --git a/flannel/templates/configmap-bin.yaml b/flannel/templates/configmap-bin.yaml
index 02e2442af..450125dea 100644
--- a/flannel/templates/configmap-bin.yaml
+++ b/flannel/templates/configmap-bin.yaml
@@ -22,6 +22,6 @@ kind: ConfigMap
 metadata:
   name: flannel-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/fluent-logging/templates/configmap-bin.yaml b/fluent-logging/templates/configmap-bin.yaml
index be40c2ccc..e331e36e1 100644
--- a/fluent-logging/templates/configmap-bin.yaml
+++ b/fluent-logging/templates/configmap-bin.yaml
@@ -30,6 +30,6 @@ data:
 {{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   create_template.sh: |
 {{ tuple "bin/_create_template.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/fluent-logging/templates/configmap-etc.yaml b/fluent-logging/templates/configmap-etc.yaml
index 029e1bd9e..a81a8371a 100644
--- a/fluent-logging/templates/configmap-etc.yaml
+++ b/fluent-logging/templates/configmap-etc.yaml
@@ -22,12 +22,12 @@ kind: ConfigMap
 metadata:
   name: fluent-logging-etc
 data:
-  fluent-bit.conf: |+
+  fluent-bit.conf: |
 {{ include "fluent_logging.to_fluentbit_conf" .Values.conf.fluentbit | indent 4 }}
-  parsers.conf: |+
+  parsers.conf: |
 {{ include "fluent_logging.to_fluentbit_conf" .Values.conf.parsers | indent 4 }}
-  td-agent.conf: |+
+  td-agent.conf: |
 {{ include "fluent_logging.to_fluentd_conf" .Values.conf.td_agent | indent 4 }}
-  template.xml.raw: |+
+  template.xml.raw: |
 {{ include "fluent_logging.to_elasticsearch_template" .Values.conf.template | indent 4 }}
 {{- end }}
diff --git a/grafana/templates/configmap-bin.yaml b/grafana/templates/configmap-bin.yaml
index b1a566c9d..e7efdd4c2 100644
--- a/grafana/templates/configmap-bin.yaml
+++ b/grafana/templates/configmap-bin.yaml
@@ -26,7 +26,7 @@ data:
 {{- include "helm-toolkit.scripts.db_init" . | indent 4 }}
   db-session-sync.py: |
 {{ tuple "bin/_db-session-sync.py.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
   datasource.sh: |
 {{ tuple "bin/_datasource.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
diff --git a/grafana/templates/configmap-etc.yaml b/grafana/templates/configmap-etc.yaml
index 74f699e1f..e66e1ebd5 100644
--- a/grafana/templates/configmap-etc.yaml
+++ b/grafana/templates/configmap-etc.yaml
@@ -35,10 +35,10 @@ kind: ConfigMap
 metadata:
   name: grafana-etc
 data:
-  grafana.ini: |+
+  grafana.ini: |
 {{ include "helm-toolkit.utils.to_ini" .Values.conf.grafana | indent 4 }}
 {{ range $key, $value := .Values.conf.dashboards }}
-  {{$key}}.json: |+
+  {{$key}}.json: |
 {{ toJson $value | indent 4 }}
 {{ end }}
 {{- end }}
diff --git a/kibana/templates/configmap-bin.yaml b/kibana/templates/configmap-bin.yaml
index eb53b820f..61cadcdba 100644
--- a/kibana/templates/configmap-bin.yaml
+++ b/kibana/templates/configmap-bin.yaml
@@ -26,6 +26,6 @@ data:
 {{ tuple "bin/_apache.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   kibana.sh: |
 {{ tuple "bin/_kibana.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/kibana/templates/configmap-etc.yaml b/kibana/templates/configmap-etc.yaml
index 5b9800b92..09cf679ce 100644
--- a/kibana/templates/configmap-etc.yaml
+++ b/kibana/templates/configmap-etc.yaml
@@ -22,10 +22,10 @@ kind: ConfigMap
 metadata:
   name: kibana-etc
 data:
-  httpd.conf: |+
+  httpd.conf: |
 {{- tuple .Values.conf.apache.httpd "etc/_httpd.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
-  kibana-host.conf: |+
+  kibana-host.conf: |
 {{- tuple .Values.conf.apache.host "etc/_kibana-host.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
-  kibana.yml: |+
+  kibana.yml: |
 {{ toYaml .Values.conf.kibana | indent 4 }}
 {{- end }}
diff --git a/kube-dns/templates/configmap-bin.yaml b/kube-dns/templates/configmap-bin.yaml
index 961d54d8a..d7d5f6aad 100644
--- a/kube-dns/templates/configmap-bin.yaml
+++ b/kube-dns/templates/configmap-bin.yaml
@@ -22,6 +22,6 @@ kind: ConfigMap
 metadata:
   name: kube-dns-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/nfs-provisioner/templates/configmap-bin.yaml b/nfs-provisioner/templates/configmap-bin.yaml
index 37e65dcfc..351993b2e 100644
--- a/nfs-provisioner/templates/configmap-bin.yaml
+++ b/nfs-provisioner/templates/configmap-bin.yaml
@@ -22,6 +22,6 @@ kind: ConfigMap
 metadata:
   name: nfs-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/prometheus-alertmanager/templates/configmap-bin.yaml b/prometheus-alertmanager/templates/configmap-bin.yaml
index 5ccd918c7..e60b2977f 100644
--- a/prometheus-alertmanager/templates/configmap-bin.yaml
+++ b/prometheus-alertmanager/templates/configmap-bin.yaml
@@ -24,6 +24,6 @@ metadata:
 data:
   alertmanager.sh: |
 {{ tuple "bin/_alertmanager.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/prometheus-alertmanager/templates/configmap-etc.yaml b/prometheus-alertmanager/templates/configmap-etc.yaml
index 177b0fb91..00517a079 100644
--- a/prometheus-alertmanager/templates/configmap-etc.yaml
+++ b/prometheus-alertmanager/templates/configmap-etc.yaml
@@ -22,8 +22,8 @@ kind: ConfigMap
 metadata:
   name: alertmanager-etc
 data:
-  alertmanager.yml: |+
+  alertmanager.yml: |
 {{ toYaml .Values.conf.alertmanager | indent 4 }}
-  alert-templates.tmpl: |+
+  alert-templates.tmpl: |
 {{ toYaml .Values.conf.alert_templates | indent 4 }}
 {{- end }}
diff --git a/prometheus-kube-state-metrics/templates/configmap-bin.yaml b/prometheus-kube-state-metrics/templates/configmap-bin.yaml
index c360c8f58..83217621d 100644
--- a/prometheus-kube-state-metrics/templates/configmap-bin.yaml
+++ b/prometheus-kube-state-metrics/templates/configmap-bin.yaml
@@ -22,6 +22,6 @@ kind: ConfigMap
 metadata:
   name: kube-metrics-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/prometheus-node-exporter/templates/configmap-bin.yaml b/prometheus-node-exporter/templates/configmap-bin.yaml
index 9ffae3c66..1578a02fa 100644
--- a/prometheus-node-exporter/templates/configmap-bin.yaml
+++ b/prometheus-node-exporter/templates/configmap-bin.yaml
@@ -22,6 +22,6 @@ kind: ConfigMap
 metadata:
   name: node-exporter-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/prometheus-openstack-exporter/templates/configmap-bin.yaml b/prometheus-openstack-exporter/templates/configmap-bin.yaml
index 1df9ef260..01447fa88 100644
--- a/prometheus-openstack-exporter/templates/configmap-bin.yaml
+++ b/prometheus-openstack-exporter/templates/configmap-bin.yaml
@@ -22,9 +22,9 @@ kind: ConfigMap
 metadata:
   name: prometheus-openstack-exporter-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
-  ks-user.sh: |+
+  ks-user.sh: |
 {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
   prometheus-openstack-exporter.sh: |
 {{ tuple "bin/_prometheus-openstack-exporter.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
diff --git a/prometheus/templates/configmap-bin.yaml b/prometheus/templates/configmap-bin.yaml
index 8aaf24e49..08b81e265 100644
--- a/prometheus/templates/configmap-bin.yaml
+++ b/prometheus/templates/configmap-bin.yaml
@@ -26,6 +26,6 @@ data:
 {{ tuple "bin/_prometheus.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   helm-tests.sh: |
 {{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/prometheus/templates/configmap-etc.yaml b/prometheus/templates/configmap-etc.yaml
index eaa0dee29..57d9a0caf 100644
--- a/prometheus/templates/configmap-etc.yaml
+++ b/prometheus/templates/configmap-etc.yaml
@@ -22,10 +22,10 @@ kind: ConfigMap
 metadata:
   name: prometheus-etc
 data:
-  prometheus.yml: |+
+  prometheus.yml: |
 {{ toYaml .Values.conf.prometheus.scrape_configs | indent 4 }}
 {{ range $key, $value := .Values.conf.prometheus.rules }}
-  {{ $key }}.rules: |+
+  {{ $key }}.rules: |
 {{ toYaml $value | indent 4 }}
 {{ end }}
 {{- end }}
diff --git a/redis/templates/configmap-bin.yaml b/redis/templates/configmap-bin.yaml
index 50ee33613..76bb0a0ad 100644
--- a/redis/templates/configmap-bin.yaml
+++ b/redis/templates/configmap-bin.yaml
@@ -22,6 +22,6 @@ kind: ConfigMap
 metadata:
   name: redis-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
diff --git a/registry/templates/configmap-bin.yaml b/registry/templates/configmap-bin.yaml
index 92a86a406..0f43eef89 100644
--- a/registry/templates/configmap-bin.yaml
+++ b/registry/templates/configmap-bin.yaml
@@ -22,10 +22,10 @@ kind: ConfigMap
 metadata:
   name: registry-bin
 data:
-  bootstrap.sh: |+
+  bootstrap.sh: |
 {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  registry.sh: |+
+  registry.sh: |
 {{ tuple "bin/_registry.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  registry-proxy.sh: |+
+  registry-proxy.sh: |
 {{ tuple "bin/_registry-proxy.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end }}
diff --git a/registry/templates/configmap-etc.yaml b/registry/templates/configmap-etc.yaml
index fe6ee325a..dc39a97cc 100644
--- a/registry/templates/configmap-etc.yaml
+++ b/registry/templates/configmap-etc.yaml
@@ -31,8 +31,8 @@ kind: ConfigMap
 metadata:
   name: registry-etc
 data:
-  config.yml: |+
+  config.yml: |
 {{  toYaml .Values.conf.registry | indent 4 }}
-  default.conf: |+
+  default.conf: |
 {{ tuple "etc/_default.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end }}
diff --git a/tiller/templates/configmap-bin.yaml b/tiller/templates/configmap-bin.yaml
index 540a978e9..2872fa982 100644
--- a/tiller/templates/configmap-bin.yaml
+++ b/tiller/templates/configmap-bin.yaml
@@ -22,6 +22,6 @@ kind: ConfigMap
 metadata:
   name: tiller-bin
 data:
-  image-repo-sync.sh: |+
+  image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}