Merge pull request #367 from jmlrt/logstash-memory

[logstash] update logstash default values for memory requirements
elastic · Nov 13, 2019 · 7b47ceb · 7b47ceb
2 parents c20f113 + 42c5cfb
commit 7b47ceb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/logstash/README.md b/logstash/README.md
@@ -82,7 +82,7 @@ helm install --name logstash elastic/logstash --set imageTag=7.4.1
 | `priorityClassName`           | The [name of the PriorityClass](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass). No default is supplied as the PriorityClass must be created first.                                                                                                                              | `""`                                                                                                                      |
 | `readinessProbe`              | Configuration fields for the [readinessProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/)                                                                                                                                                                               | `failureThreshold: 3`<br>`initialDelaySeconds: 30`<br>`periodSeconds: 10`<br>`successThreshold: 3`<br>`timeoutSeconds: 5` |
 | `replicas`                    | Kubernetes replica count for the statefulset (i.e. how many pods)                                                                                                                                                                                                                                                          | `1`                                                                                                                       |
-| `resources`                   | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the statefulset                                                                                                                                                                               | `requests.cpu: 100m`<br>`requests.memory: 2Gi`<br>`limits.cpu: 1000m`<br>`limits.memory: 2Gi`                             |
+| `resources`                   | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the statefulset                                                                                                                                                                               | `requests.cpu: 100m`<br>`requests.memory: 1536Mi`<br>`limits.cpu: 1000m`<br>`limits.memory: 1536Mi`                             |
 | `schedulerName`               | Name of the [alternate scheduler](https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/#specify-schedulers-for-pods)                                                                                                                                                                          | `""`                                                                                                                      |
 | `secretMounts`                | Allows you easily mount a secret as a file inside the statefulset. Useful for mounting certificates and other secrets. See [values.yaml](./values.yaml) for an example                                                                                                                                                     | `[]`                                                                                                                      |
 | `securityContext`             | Allows you to set the [securityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) for the container                                                                                                                                             | `capabilities.drop:[ALL]`<br>`runAsNonRoot: true`<br>`runAsUser: 1000`                                                    |

diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py
@@ -77,11 +77,11 @@ def test_defaults():
     assert c['resources'] == {
         'requests': {
             'cpu': '100m',
-            'memory': '2Gi'
+            'memory': '1536Mi'
         },
         'limits': {
             'cpu': '1000m',
-            'memory': '2Gi'
+            'memory': '1536Mi'
         }
     }
 

diff --git a/logstash/values.yaml b/logstash/values.yaml
@@ -46,10 +46,10 @@ logstashJavaOpts: "-Xmx1g -Xms1g"
 resources:
   requests:
     cpu: "100m"
-    memory: "2Gi"
+    memory: "1536Mi"
   limits:
     cpu: "1000m"
-    memory: "2Gi"
+    memory: "1536Mi"
 
 volumeClaimTemplate:
   accessModes: [ "ReadWriteOnce" ]