Merge pull request #204 from elastic/always_always

[kibana] Make imagePullPolicy actually do something
elastic · Jul 8, 2019 · 5acb1b0 · 5acb1b0
2 parents 1b35413 + 7d82075
commit 5acb1b0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
@@ -64,6 +64,7 @@ spec:
         securityContext:
 {{ toYaml .Values.securityContext | indent 10 }}
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
         env:
           {{- if .Values.elasticsearchURL }}
           - name: ELASTICSEARCH_URL

diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py
@@ -333,3 +333,18 @@ def test_override_the_serverHost():
     c = r['deployment'][name]['spec']['template']['spec']['containers'][0]
     assert c['env'][1]['name'] == 'SERVER_HOST'
     assert c['env'][1]['value'] == 'localhost'
+
+def test_override_imagePullPolicy():
+    config = ''
+
+    r = helm_template(config)
+    c = r['deployment'][name]['spec']['template']['spec']['containers'][0]
+    assert c['imagePullPolicy'] == 'IfNotPresent'
+
+    config = '''
+    imagePullPolicy: Always
+    '''
+
+    r = helm_template(config)
+    c = r['deployment'][name]['spec']['template']['spec']['containers'][0]
+    assert c['imagePullPolicy'] == 'Always'