diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-17 13:47:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 13:47:01 -0400 |
| commit | 7a36a31df7b86f56a3d54662a7b27522dc5836ec (patch) | |
| tree | 8fb27d23489a22caa362ff41c5325b1690c4426f /roles/openshift_logging_elasticsearch/templates/es.j2 | |
| parent | 940b829df1c1adfbea80237f60dc196d5a5d2856 (diff) | |
| parent | 8ac453a66799a4d3bc9167beeed0358a1e1ceab5 (diff) | |
| download | openshift-7a36a31df7b86f56a3d54662a7b27522dc5836ec.tar.gz openshift-7a36a31df7b86f56a3d54662a7b27522dc5836ec.tar.bz2 openshift-7a36a31df7b86f56a3d54662a7b27522dc5836ec.tar.xz openshift-7a36a31df7b86f56a3d54662a7b27522dc5836ec.zip | |
Merge pull request #5754 from ewolinetz/bz1501831
Updating ES proxy image prefix and version to match other components
Diffstat (limited to 'roles/openshift_logging_elasticsearch/templates/es.j2')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/templates/es.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2 index 1ed886627..ce3b2eb83 100644 --- a/roles/openshift_logging_elasticsearch/templates/es.j2 +++ b/roles/openshift_logging_elasticsearch/templates/es.j2 @@ -40,7 +40,7 @@ spec: {% endif %} containers: - name: proxy - image: {{openshift_logging_elasticsearch_proxy_image_prefix}}:{{openshift_logging_elasticsearch_proxy_image_version}} + image: {{ proxy_image }} imagePullPolicy: Always args: - --upstream-ca=/etc/elasticsearch/secret/admin-ca @@ -86,7 +86,7 @@ spec: requests: memory: "{{es_memory_limit}}" {% if es_container_security_context %} - securityContext: {{ es_container_security_context | to_yaml }} + securityContext: {{ es_container_security_context | to_yaml }} {% endif %} ports: - |