diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-26 22:44:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 22:44:48 -0700 |
| commit | 742d338d7c133c4670d6e887655edaf89949df8c (patch) | |
| tree | f3a3d613179c9d5f111c7f35afcc0223aa61da94 | |
| parent | cabf9dd27bbbe063d54d6f7f80658796126c435e (diff) | |
| parent | c1729539ad6e66be0037d62b585621d7ae33d2ed (diff) | |
| download | openshift-742d338d7c133c4670d6e887655edaf89949df8c.tar.gz openshift-742d338d7c133c4670d6e887655edaf89949df8c.tar.bz2 openshift-742d338d7c133c4670d6e887655edaf89949df8c.tar.xz openshift-742d338d7c133c4670d6e887655edaf89949df8c.zip | |
Merge pull request #5358 from wozniakjan/logging_kibana_ops/default_memory
Automatic merge from submit-queue
logging: fix kibana and kibana-ops defaults
- move kibana-ops defaults to `openshift_logging_kibana` role
- set kibana-ops memory limit to 256Mi to match kibana memory limit
**additional steps:**
- [ ] backport to 3.6
- [ ] backport to 3.5
- [x] wait for PR #5176 to merge and rebase
cc: @jcantrill
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index db4262fed..5574a1446 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -32,7 +32,7 @@ openshift_logging_kibana_cpu_limit: null openshift_logging_kibana_memory_limit: 736Mi openshift_logging_kibana_proxy_debug: false openshift_logging_kibana_proxy_cpu_limit: null -openshift_logging_kibana_proxy_memory_limit: 96Mi +openshift_logging_kibana_proxy_memory_limit: 256Mi openshift_logging_kibana_replica_count: 1 openshift_logging_kibana_edge_term_policy: Redirect @@ -56,7 +56,7 @@ openshift_logging_kibana_ops_cpu_limit: null openshift_logging_kibana_ops_memory_limit: 736Mi openshift_logging_kibana_ops_proxy_debug: false openshift_logging_kibana_ops_proxy_cpu_limit: null -openshift_logging_kibana_ops_proxy_memory_limit: 96Mi +openshift_logging_kibana_ops_proxy_memory_limit: 256Mi openshift_logging_kibana_ops_replica_count: 1 #The absolute path on the control node to the cert file to use |