Fix elasticsearch curator file entry in configmap

Fixes an issue preventing the elastic curator configuration being
populated via elasticsearch's values.yaml

Change-Id: I74901c1aa99abc56a06ea95ca9ea9d818761d79b
This commit is contained in:
Steve Wilkerson 2017-12-04 08:06:07 -06:00
parent 8d309f5cff
commit 1753d19a68
4 changed files with 8 additions and 9 deletions

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
{{/*
Copyright 2017 The Openstack-Helm Authors.

View File

@ -26,8 +26,8 @@ data:
{{- tuple .Values.conf.elasticsearch "etc/_elasticsearch.yml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
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 }}

View File

@ -24,7 +24,7 @@ kind: CronJob
metadata:
name: curator
spec:
schedule: {{ .Values.conf.curator.schedule }}
schedule: {{ .Values.conf.curator.schedule | quote }}
jobTemplate:
metadata:
labels:

View File

@ -133,9 +133,9 @@ conf:
init:
max_map_count: 262144
curator:
schedule: 1 0 * * *
action_file: |
---
#runs weekly
schedule: "0 0 * * 0"
action_file:
# Remember, leave a key empty if there is no value. None will be a string,
# not a Python "NoneType"
#
@ -161,8 +161,7 @@ conf:
stats_result:
epoch:
exclude: False
config: |
---
config:
# Remember, leave a key empty if there is no value. None will be a string,
# not a Python "NoneType"
client: