diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-24 18:27:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 18:27:08 -0700 |
| commit | f0da12b7292cddabfc7c33206cabf0ff34aa9852 (patch) | |
| tree | a3c11fa5f3ab580c9c690cabec804841129941ad /roles/openshift_logging_kibana | |
| parent | 0cccbc04aee808280eb6e5baf0f87494ffee97ce (diff) | |
| parent | 862f50ff66324d7d1f23fe9bedd5d9d664578302 (diff) | |
| download | openshift-f0da12b7292cddabfc7c33206cabf0ff34aa9852.tar.gz openshift-f0da12b7292cddabfc7c33206cabf0ff34aa9852.tar.bz2 openshift-f0da12b7292cddabfc7c33206cabf0ff34aa9852.tar.xz openshift-f0da12b7292cddabfc7c33206cabf0ff34aa9852.zip | |
Merge pull request #5700 from wozniakjan/bz_1452939
Automatic merge from submit-queue.
Bug 1452939 - change imagePullPolicy in logging and metrics
cc: @jcantrill
Diffstat (limited to 'roles/openshift_logging_kibana')
| -rw-r--r-- | roles/openshift_logging_kibana/templates/kibana.j2 | 4 |
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 != "") %} |