From 1753d19a68291eb346c19bede7ad1ef65b0dce49 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 4 Dec 2017 08:06:07 -0600
Subject: [PATCH] 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
---
 elasticsearch/templates/bin/_curator.sh.tpl   | 2 +-
 elasticsearch/templates/configmap-etc.yaml    | 4 ++--
 elasticsearch/templates/cron-job-curator.yaml | 2 +-
 elasticsearch/values.yaml                     | 9 ++++-----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/elasticsearch/templates/bin/_curator.sh.tpl b/elasticsearch/templates/bin/_curator.sh.tpl
index 575973d6..f3b3afce 100644
--- a/elasticsearch/templates/bin/_curator.sh.tpl
+++ b/elasticsearch/templates/bin/_curator.sh.tpl
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 {{/*
 Copyright 2017 The Openstack-Helm Authors.
 
diff --git a/elasticsearch/templates/configmap-etc.yaml b/elasticsearch/templates/configmap-etc.yaml
index 9fd248ee..e5c8dd6e 100644
--- a/elasticsearch/templates/configmap-etc.yaml
+++ b/elasticsearch/templates/configmap-etc.yaml
@@ -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 }}
diff --git a/elasticsearch/templates/cron-job-curator.yaml b/elasticsearch/templates/cron-job-curator.yaml
index 73b2786f..5e98359a 100644
--- a/elasticsearch/templates/cron-job-curator.yaml
+++ b/elasticsearch/templates/cron-job-curator.yaml
@@ -24,7 +24,7 @@ kind: CronJob
 metadata:
   name: curator
 spec:
-  schedule: {{ .Values.conf.curator.schedule }}
+  schedule: {{ .Values.conf.curator.schedule | quote }}
   jobTemplate:
     metadata:
       labels:
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 81bf7962..cc0b6505 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -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: