From dbb20c786daa9af749a54ac6fee3e65a6f6c903c Mon Sep 17 00:00:00 2001
From: "Pai, Radhika (rp592h)" <rp592h@att.com>
Date: Wed, 14 Apr 2021 14:30:04 -0500
Subject: [PATCH] [fix] Update the ES curator config

The curator actions in the configmap gets set to
null which is causing error when redering any actions downstream.
Adding the {} should resolve this issue.

Change-Id: I8c337ee1f089c13f75cb7a9997a7bf6f04246160
---
 elasticsearch/Chart.yaml              | 2 +-
 elasticsearch/values.yaml             | 4 ++--
 releasenotes/notes/elasticsearch.yaml | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
index 600dd5c8f2..0968186473 100644
--- a/elasticsearch/Chart.yaml
+++ b/elasticsearch/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.6.2
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 0.2.1
+version: 0.2.2
 home: https://www.elastic.co/
 sources:
   - https://github.com/elastic/elasticsearch
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 250b75239a..9155250f60 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -585,7 +585,7 @@ conf:
   ceph:
     admin_keyring: null
   curator:
-    action_file:
+    action_file: {}
       # Remember, leave a key empty if there is no value.  None will be a string,
       # not a Python "NoneType"
       #
@@ -598,7 +598,7 @@ conf:
       # the desired configuration should include all fields as to avoid unwanted
       # merges with a set of dummy default values. The supplied values can be
       # used as an example
-      actions:
+      # actions:
         # 1:
         #   action: delete_indices
         #   description: >-
diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml
index 8117730969..747271214e 100644
--- a/releasenotes/notes/elasticsearch.yaml
+++ b/releasenotes/notes/elasticsearch.yaml
@@ -11,4 +11,5 @@ elasticsearch:
   - 0.1.8 Disable Curator in Gate & Chart Defaults
   - 0.2.0 Add more S3 configuration options
   - 0.2.1 Make templates job more robust & allow overrides
+  - 0.2.2 Update the ES curator config to {}
 ...