diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-04-28 11:24:31 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-05-11 09:36:06 -0400 |
| commit | ba4c43fe61ca40b347a9f75891ba67ab36465871 (patch) | |
| tree | ab6e3ff1e484c3e71dc69f408e429a9c304bd44f /roles/openshift_logging/templates | |
| parent | 74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f (diff) | |
| download | openshift-ba4c43fe61ca40b347a9f75891ba67ab36465871.tar.gz openshift-ba4c43fe61ca40b347a9f75891ba67ab36465871.tar.bz2 openshift-ba4c43fe61ca40b347a9f75891ba67ab36465871.tar.xz openshift-ba4c43fe61ca40b347a9f75891ba67ab36465871.zip | |
bug 1441369. Kibana memory limits
bug 1439451. Kibana crash
(cherry picked from commit 66315ebbfcfda72d6f501c441359d92ec71af7d2)
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 |