summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_kibana
diff options
context:
space:
mode:
authorJan Wozniak <jwozniak@redhat.com>2017-10-09 16:58:32 +0200
committerJan Wozniak <jwozniak@redhat.com>2017-10-23 10:06:30 +0200
commit862f50ff66324d7d1f23fe9bedd5d9d664578302 (patch)
treed5eab05cd8f4f6d9bffa58861d2c13eb4373617b /roles/openshift_logging_kibana
parent1a0f460eb67f1a6fa82385faa91df4edd4b9d7d3 (diff)
downloadopenshift-862f50ff66324d7d1f23fe9bedd5d9d664578302.tar.gz
openshift-862f50ff66324d7d1f23fe9bedd5d9d664578302.tar.bz2
openshift-862f50ff66324d7d1f23fe9bedd5d9d664578302.tar.xz
openshift-862f50ff66324d7d1f23fe9bedd5d9d664578302.zip
Bug 1452939 - change Logging & Metrics imagePullPolicy
- all images logging and metrics change their default imagePullPolicy from Always to IfNotPresent
Diffstat (limited to 'roles/openshift_logging_kibana')
-rw-r--r--roles/openshift_logging_kibana/templates/kibana.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_kibana/templates/kibana.j2 b/roles/openshift_logging_kibana/templates/kibana.j2
index 329ccbde2..4ff86729a 100644
--- a/roles/openshift_logging_kibana/templates/kibana.j2
+++ b/roles/openshift_logging_kibana/templates/kibana.j2
@@ -37,7 +37,7 @@ spec:
-
name: "kibana"
image: {{ image }}
- imagePullPolicy: Always
+ imagePullPolicy: IfNotPresent
{% if (kibana_memory_limit is defined and kibana_memory_limit is not none and kibana_memory_limit != "") or (kibana_cpu_limit is defined and kibana_cpu_limit is not none and kibana_cpu_limit != "") or (kibana_cpu_request is defined and kibana_cpu_request is not none and kibana_cpu_request != "") %}
resources:
{% if (kibana_memory_limit is defined and kibana_memory_limit is not none and kibana_memory_limit != "") or (kibana_cpu_limit is defined and kibana_cpu_limit is not none and kibana_cpu_limit != "") %}
@@ -84,7 +84,7 @@ spec:
-
name: "kibana-proxy"
image: {{ proxy_image }}
- imagePullPolicy: Always
+ imagePullPolicy: IfNotPresent
{% if (kibana_proxy_memory_limit is defined and kibana_proxy_memory_limit is not none and kibana_proxy_memory_limit != "") or (kibana_proxy_cpu_limit is defined and kibana_proxy_cpu_limit is not none and kibana_proxy_cpu_limit != "") or (kibana_proxy_cpu_request is defined and kibana_proxy_cpu_request is not none and kibana_proxy_cpu_request != "") %}
resources:
{% if (kibana_proxy_memory_limit is defined and kibana_proxy_memory_limit is not none and kibana_proxy_memory_limit != "") or (kibana_proxy_cpu_limit is defined and kibana_proxy_cpu_limit is not none and kibana_proxy_cpu_limit != "") %}