values: fix duplication, move hooks closer to the lifecycle; tests: a…

…dd sugested test

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@commercetools.de>

elasticsearch/tests/elasticsearch_test.py

@@ -655,3 +655,20 @@ def test_master_termination_fixed_enabled():
 
     c = r['statefulset'][uname]['spec']['template']['spec']['containers'][1]
     assert c['name'] == 'elasticsearch-master-graceful-termination-handler'
+
+def test_lifecycle_hooks():
+    config = ''
+    r = helm_template(config)
+    c = r['statefulset'][uname]['spec']['template']['spec']['containers'][0]
+    assert 'lifecycle' not in c
+
+    config = '''
+    lifecycle:
+      preStop:
+        exec:
+          command: ["/bin/bash","/preStop"]
+    '''
+    r = helm_template(config)
+    c = r['statefulset'][uname]['spec']['template']['spec']['containers'][0]
+
+    assert c['lifecycle']['preStop']['exec']['command'] == ["/bin/bash","/preStop"]

elasticsearch/values.yaml

@@ -27,14 +27,6 @@ esConfig: {}
 #  log4j2.properties: |
 #    key = value
 
-# Add custom preStop, postStart lifecycle hooks
-hooks: {}
-  ## (string) Script to execute prior the pod stops.
-  # preStop: |-
-
-  ## (string) Script to execute after the pod starts.
-  # postStart: |-
-
 # Extra environment variables to append to this nodeGroup
 # This will be appended to the current 'env:' key. You can use any of the kubernetes env
 # syntax here
@@ -197,6 +189,14 @@ lifecycle: {}
   # preStop:
   #   exec:
   #     command: ["/bin/bash","/preStop"]
-  # preStop:
+  # postStart:
   #   exec:
-  #     command: ["/bin/bash","/preStop"]
+  #     command: ["/bin/bash","/postStart"]
+
+# Add custom preStop, postStart lifecycle hooks
+hooks: {}
+  ## (string) Script to execute prior the pod stops.
+  # preStop: |-
+
+  ## (string) Script to execute after the pod starts.
+  # postStart: |-