diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-12 14:20:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 14:20:29 -0500 |
| commit | ad18b8ee7a2468413c70cc4f263c6a147acb5fef (patch) | |
| tree | 2b09679de3894031f045394c99fd88ab9b1f36b0 /roles/openshift_logging/templates | |
| parent | d1d60e24b54ca6ba0dc98e8b0b2ea4cfa8b92830 (diff) | |
| parent | ba4c43fe61ca40b347a9f75891ba67ab36465871 (diff) | |
| download | openshift-ad18b8ee7a2468413c70cc4f263c6a147acb5fef.tar.gz openshift-ad18b8ee7a2468413c70cc4f263c6a147acb5fef.tar.bz2 openshift-ad18b8ee7a2468413c70cc4f263c6a147acb5fef.tar.xz openshift-ad18b8ee7a2468413c70cc4f263c6a147acb5fef.zip | |
Merge pull request #4162 from jcantrill/bz1439451_kibana_crash
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/templates')
| -rw-r--r-- | roles/openshift_logging/templates/kibana.j2 | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/roles/openshift_logging/templates/kibana.j2 b/roles/openshift_logging/templates/kibana.j2 index e6ecf82ff..25fab9ac4 100644 --- a/roles/openshift_logging/templates/kibana.j2 +++ b/roles/openshift_logging/templates/kibana.j2 @@ -44,15 +44,19 @@ spec: {% if kibana_cpu_limit is not none %} cpu: "{{kibana_cpu_limit}}" {% endif %} -{% if kibana_memory_limit is not none %} - memory: "{{kibana_memory_limit}}" -{% endif %} + memory: "{{kibana_memory_limit | default('736Mi') }}" {% endif %} env: - name: "ES_HOST" value: "{{es_host}}" - name: "ES_PORT" value: "{{es_port}}" + - + name: "KIBANA_MEMORY_LIMIT" + valueFrom: + resourceFieldRef: + containerName: kibana + resource: limits.memory volumeMounts: - name: kibana mountPath: /etc/kibana/keys @@ -67,9 +71,7 @@ spec: {% if kibana_proxy_cpu_limit is not none %} cpu: "{{kibana_proxy_cpu_limit}}" {% endif %} -{% if kibana_proxy_memory_limit is not none %} - memory: "{{kibana_proxy_memory_limit}}" -{% endif %} + memory: "{{kibana_proxy_memory_limit | default('96Mi') }}" {% endif %} ports: - @@ -103,6 +105,27 @@ spec: - name: "OAP_DEBUG" value: "{{openshift_logging_kibana_proxy_debug}}" + - + name: "OAP_OAUTH_SECRET_FILE" + value: "/secret/oauth-secret" + - + name: "OAP_SERVER_CERT_FILE" + value: "/secret/server-cert" + - + name: "OAP_SERVER_KEY_FILE" + value: "/secret/server-key" + - + name: "OAP_SERVER_TLS_FILE" + value: "/secret/server-tls.json" + - + name: "OAP_SESSION_SECRET_FILE" + value: "/secret/session-secret" + - + name: "OCP_AUTH_PROXY_MEMORY_LIMIT" + valueFrom: + resourceFieldRef: + containerName: kibana-proxy + resource: limits.memory volumeMounts: - name: kibana-proxy mountPath: /secret |