From 63ada7782f46a722514c49ae93e80afc7473fd26 Mon Sep 17 00:00:00 2001
From: y-kumazaki <kumazaki@lab.acs-jp.com>
Date: Thu, 31 Oct 2019 15:53:54 +0900
Subject: [PATCH] use same imagePullPolicy in initContainer

Signed-off-by: y-kumazaki <kumazaki@lab.acs-jp.com>
---
 elasticsearch/templates/statefulset.yaml  |  2 ++
 elasticsearch/tests/elasticsearch_test.py | 26 +++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
index 175f6a835..593504fcf 100644
--- a/elasticsearch/templates/statefulset.yaml
+++ b/elasticsearch/templates/statefulset.yaml
@@ -138,6 +138,7 @@ spec:
           runAsUser: 0
           privileged: true
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
         command: ["sysctl", "-w", "vm.max_map_count={{ .Values.sysctlVmMaxMapCount}}"]
         resources:
 {{ toYaml .Values.initResources | indent 10 }}
@@ -145,6 +146,7 @@ spec:
 {{ if .Values.keystore }}
       - name: keystore
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
         command:
         - sh
         - -c
diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
index 4a83deaf5..2e88b5e8d 100755
--- a/elasticsearch/tests/elasticsearch_test.py
+++ b/elasticsearch/tests/elasticsearch_test.py
@@ -354,6 +354,19 @@ def test_sysctl_init_container_enabled():
     initContainers = r['statefulset'][uname]['spec']['template']['spec']['initContainers']
     assert initContainers[0]['name'] == 'configure-sysctl'
 
+def test_sysctl_init_container_image():
+    config = '''
+image: customImage
+imageTag: 6.2.4
+imagePullPolicy: Never
+sysctlInitContainer:
+  enabled: true
+'''
+    r = helm_template(config)
+    initContainers = r['statefulset'][uname]['spec']['template']['spec']['initContainers']
+    assert initContainers[0]['image'] == 'customImage:6.2.4'
+    assert initContainers[0]['imagePullPolicy'] == 'Never'
+
 def test_adding_storageclass_annotation_to_volumeclaimtemplate():
     config = '''
 persistence:
@@ -870,6 +883,19 @@ def test_keystore_init_container():
 
     assert i['name'] == 'keystore'
 
+def test_keystore_init_container_image():
+    config = '''
+image: customImage
+imageTag: 6.2.4
+imagePullPolicy: Never
+keystore:
+  - secretName: test
+'''
+    r = helm_template(config)
+    i = r['statefulset'][uname]['spec']['template']['spec']['initContainers'][-1]
+    assert i['image'] == 'customImage:6.2.4'
+    assert i['imagePullPolicy'] == 'Never'
+
 def test_keystore_mount():
     config = '''
 keystore: