openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "yaml cleanup: trim multiline strings"

Browse Source
This commit is contained in:
Zuul 2018-03-10 07:01:35 +00:00 committed by Gerrit Code Review
commit eb3cbf0f95
24 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calico/templates/configmap-bin.yaml
View File

@ -22,10 +22,10 @@ kind: ConfigMap
metadata: metadata:
name: calico-bin name: calico-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- 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 }} {{ 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 }} {{ tuple "bin/_calico-settings.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }} {{- end }}

20
calico/templates/configmap-etc.yaml
View File

@ -39,25 +39,25 @@ data:
# we overlay templates found natively in the calico-node container so that we may override # we overlay templates found natively in the calico-node container so that we may override
# bgp configuration # 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 }} {{ 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 }} {{ 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 }} {{ 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 }} {{ 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 }} {{ 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 }} {{ 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 }} {{ 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 }} {{ 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 }} {{ 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 }} {{ 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 # The location of your etcd cluster. This uses the Service clusterIP

2
elasticsearch/templates/configmap-bin.yaml
View File

@ -32,6 +32,6 @@ data:
{{ tuple "bin/_register-repository.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_register-repository.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
curator.sh: | curator.sh: |
{{ tuple "bin/_curator.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ 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 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

12
elasticsearch/templates/configmap-etc.yaml
View File

@ -26,16 +26,16 @@ kind: ConfigMap
metadata: metadata:
name: elasticsearch-etc name: elasticsearch-etc
data: data:
httpd.conf: |+ httpd.conf: |
{{- tuple .Values.conf.apache.httpd "etc/_httpd.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- 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" }} {{- 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 }} {{ 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" }} {{- 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 }} {{ toYaml .Values.conf.curator.action_file | indent 4 }}
config.yml: |+ config.yml: |
{{ toYaml .Values.conf.curator.config | indent 4 }} {{ toYaml .Values.conf.curator.config | indent 4 }}
{{- end }} {{- end }}

2
flannel/templates/configmap-bin.yaml
View File

@ -22,6 +22,6 @@ kind: ConfigMap
metadata: metadata:
name: flannel-bin name: flannel-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

2
fluent-logging/templates/configmap-bin.yaml
View File

@ -30,6 +30,6 @@ data:
{{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
create_template.sh: | create_template.sh: |
{{ tuple "bin/_create_template.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ 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 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

8
fluent-logging/templates/configmap-etc.yaml
View File

@ -22,12 +22,12 @@ kind: ConfigMap
metadata: metadata:
name: fluent-logging-etc name: fluent-logging-etc
data: data:
fluent-bit.conf: |+ fluent-bit.conf: |
{{ include "fluent_logging.to_fluentbit_conf" .Values.conf.fluentbit | indent 4 }} {{ 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 }} {{ 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 }} {{ 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 }} {{ include "fluent_logging.to_elasticsearch_template" .Values.conf.template | indent 4 }}
{{- end }} {{- end }}

2
grafana/templates/configmap-bin.yaml
View File

@ -26,7 +26,7 @@ data:
{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} {{- include "helm-toolkit.scripts.db_init" . | indent 4 }}
db-session-sync.py: | db-session-sync.py: |
{{ tuple "bin/_db-session-sync.py.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ 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 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
datasource.sh: | datasource.sh: |
{{ tuple "bin/_datasource.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_datasource.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}

4
grafana/templates/configmap-etc.yaml
View File

@ -35,10 +35,10 @@ kind: ConfigMap
metadata: metadata:
name: grafana-etc name: grafana-etc
data: data:
grafana.ini: |+ grafana.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.grafana | indent 4 }} {{ include "helm-toolkit.utils.to_ini" .Values.conf.grafana | indent 4 }}
{{ range $key, $value := .Values.conf.dashboards }} {{ range $key, $value := .Values.conf.dashboards }}
{{$key}}.json: |+ {{$key}}.json: |
{{ toJson $value | indent 4 }} {{ toJson $value | indent 4 }}
{{ end }} {{ end }}
{{- end }} {{- end }}

2
kibana/templates/configmap-bin.yaml
View File

@ -26,6 +26,6 @@ data:
{{ tuple "bin/_apache.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_apache.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
kibana.sh: | kibana.sh: |
{{ tuple "bin/_kibana.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ 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 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

6
kibana/templates/configmap-etc.yaml
View File

@ -22,10 +22,10 @@ kind: ConfigMap
metadata: metadata:
name: kibana-etc name: kibana-etc
data: data:
httpd.conf: |+ httpd.conf: |
{{- tuple .Values.conf.apache.httpd "etc/_httpd.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- 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" }} {{- 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 }} {{ toYaml .Values.conf.kibana | indent 4 }}
{{- end }} {{- end }}

2
kube-dns/templates/configmap-bin.yaml
View File

@ -22,6 +22,6 @@ kind: ConfigMap
metadata: metadata:
name: kube-dns-bin name: kube-dns-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

2
nfs-provisioner/templates/configmap-bin.yaml
View File

@ -22,6 +22,6 @@ kind: ConfigMap
metadata: metadata:
name: nfs-bin name: nfs-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

2
prometheus-alertmanager/templates/configmap-bin.yaml
View File

@ -24,6 +24,6 @@ metadata:
data: data:
alertmanager.sh: | alertmanager.sh: |
{{ tuple "bin/_alertmanager.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ 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 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

4
prometheus-alertmanager/templates/configmap-etc.yaml
View File

@ -22,8 +22,8 @@ kind: ConfigMap
metadata: metadata:
name: alertmanager-etc name: alertmanager-etc
data: data:
alertmanager.yml: |+ alertmanager.yml: |
{{ toYaml .Values.conf.alertmanager | indent 4 }} {{ toYaml .Values.conf.alertmanager | indent 4 }}
alert-templates.tmpl: |+ alert-templates.tmpl: |
{{ toYaml .Values.conf.alert_templates | indent 4 }} {{ toYaml .Values.conf.alert_templates | indent 4 }}
{{- end }} {{- end }}

2
prometheus-kube-state-metrics/templates/configmap-bin.yaml
View File

@ -22,6 +22,6 @@ kind: ConfigMap
metadata: metadata:
name: kube-metrics-bin name: kube-metrics-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

2
prometheus-node-exporter/templates/configmap-bin.yaml
View File

@ -22,6 +22,6 @@ kind: ConfigMap
metadata: metadata:
name: node-exporter-bin name: node-exporter-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

4
prometheus-openstack-exporter/templates/configmap-bin.yaml
View File

@ -22,9 +22,9 @@ kind: ConfigMap
metadata: metadata:
name: prometheus-openstack-exporter-bin name: prometheus-openstack-exporter-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
ks-user.sh: |+ ks-user.sh: |
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
prometheus-openstack-exporter.sh: | prometheus-openstack-exporter.sh: |
{{ tuple "bin/_prometheus-openstack-exporter.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_prometheus-openstack-exporter.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}

2
prometheus/templates/configmap-bin.yaml
View File

@ -26,6 +26,6 @@ data:
{{ tuple "bin/_prometheus.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_prometheus.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
helm-tests.sh: | helm-tests.sh: |
{{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ 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 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

4
prometheus/templates/configmap-etc.yaml
View File

@ -22,10 +22,10 @@ kind: ConfigMap
metadata: metadata:
name: prometheus-etc name: prometheus-etc
data: data:
prometheus.yml: |+ prometheus.yml: |
{{ toYaml .Values.conf.prometheus.scrape_configs | indent 4 }} {{ toYaml .Values.conf.prometheus.scrape_configs | indent 4 }}
{{ range $key, $value := .Values.conf.prometheus.rules }} {{ range $key, $value := .Values.conf.prometheus.rules }}
{{ $key }}.rules: |+ {{ $key }}.rules: |
{{ toYaml $value | indent 4 }} {{ toYaml $value | indent 4 }}
{{ end }} {{ end }}
{{- end }} {{- end }}

2
redis/templates/configmap-bin.yaml
View File

@ -22,6 +22,6 @@ kind: ConfigMap
metadata: metadata:
name: redis-bin name: redis-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}

6
registry/templates/configmap-bin.yaml
View File

@ -22,10 +22,10 @@ kind: ConfigMap
metadata: metadata:
name: registry-bin name: registry-bin
data: data:
bootstrap.sh: |+ bootstrap.sh: |
{{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ 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 }} {{ 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 }} {{ tuple "bin/_registry-proxy.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }} {{- end }}

4
registry/templates/configmap-etc.yaml
View File

@ -31,8 +31,8 @@ kind: ConfigMap
metadata: metadata:
name: registry-etc name: registry-etc
data: data:
config.yml: |+ config.yml: |
{{ toYaml .Values.conf.registry | indent 4 }} {{ toYaml .Values.conf.registry | indent 4 }}
default.conf: |+ default.conf: |
{{ tuple "etc/_default.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "etc/_default.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }} {{- end }}

2
tiller/templates/configmap-bin.yaml
View File

@ -22,6 +22,6 @@ kind: ConfigMap
metadata: metadata:
name: tiller-bin name: tiller-bin
data: data:
image-repo-sync.sh: |+ image-repo-sync.sh: |
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
{{- end }} {{- end }}