summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_fluentd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-24 18:27:08 -0700
committerGitHub <noreply@github.com>2017-10-24 18:27:08 -0700
commitf0da12b7292cddabfc7c33206cabf0ff34aa9852 (patch)
treea3c11fa5f3ab580c9c690cabec804841129941ad /roles/openshift_logging_fluentd
parent0cccbc04aee808280eb6e5baf0f87494ffee97ce (diff)
parent862f50ff66324d7d1f23fe9bedd5d9d664578302 (diff)
downloadopenshift-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_fluentd')
-rw-r--r--roles/openshift_logging_fluentd/templates/fluentd.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2
index b07175a50..10283316c 100644
--- a/roles/openshift_logging_fluentd/templates/fluentd.j2
+++ b/roles/openshift_logging_fluentd/templates/fluentd.j2
@@ -29,7 +29,7 @@ spec:
containers:
- name: "{{ daemonset_container_name }}"
image: "{{ openshift_logging_fluentd_image_prefix }}{{ daemonset_name }}:{{ openshift_logging_fluentd_image_version }}"
- imagePullPolicy: Always
+ imagePullPolicy: IfNotPresent
securityContext:
privileged: true
{% if (fluentd_memory_limit is defined and fluentd_memory_limit is not none) or (fluentd_cpu_limit is defined and fluentd_cpu_limit is not none) or (fluentd_cpu_request is defined and fluentd_cpu_request is not none) %}