From 7eb71d8a46b7dea18907c08e709f007b90da7254 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 13 Nov 2019 06:37:33 +0100 Subject: [PATCH 1/2] [logstash] update logstash default values for memory requirements --- logstash/README.md | 2 +- logstash/tests/logstash_test.py | 4 ++-- logstash/values.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/logstash/README.md b/logstash/README.md index 07d3fe5bd..66555a9dc 100644 --- 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`
`initialDelaySeconds: 30`
`periodSeconds: 10`
`successThreshold: 3`
`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`
`requests.memory: 2Gi`
`limits.cpu: 1000m`
`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`
`requests.memory: 1280Mi`
`limits.cpu: 1000m`
`limits.memory: 1280Mi` | | `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]`
`runAsNonRoot: true`
`runAsUser: 1000` | diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py index cd64516ab..4e1f05b97 100755 --- 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': '1280Mi' }, 'limits': { 'cpu': '1000m', - 'memory': '2Gi' + 'memory': '1280Mi' } } diff --git a/logstash/values.yaml b/logstash/values.yaml index 2470c7943..6705565eb 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -46,10 +46,10 @@ logstashJavaOpts: "-Xmx1g -Xms1g" resources: requests: cpu: "100m" - memory: "2Gi" + memory: "1280Mi" limits: cpu: "1000m" - memory: "2Gi" + memory: "1280Mi" volumeClaimTemplate: accessModes: [ "ReadWriteOnce" ] From 42c5cfb4bbcb1389a9241075ff16fb04501c11c7 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 13 Nov 2019 09:12:46 +0100 Subject: [PATCH 2/2] [logstash] increase pod memory resources --- logstash/README.md | 2 +- logstash/tests/logstash_test.py | 4 ++-- logstash/values.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/logstash/README.md b/logstash/README.md index 66555a9dc..4af8d7f85 100644 --- 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`
`initialDelaySeconds: 30`
`periodSeconds: 10`
`successThreshold: 3`
`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`
`requests.memory: 1280Mi`
`limits.cpu: 1000m`
`limits.memory: 1280Mi` | +| `resources` | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the statefulset | `requests.cpu: 100m`
`requests.memory: 1536Mi`
`limits.cpu: 1000m`
`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]`
`runAsNonRoot: true`
`runAsUser: 1000` | diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py index 4e1f05b97..7b08ee62b 100755 --- 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': '1280Mi' + 'memory': '1536Mi' }, 'limits': { 'cpu': '1000m', - 'memory': '1280Mi' + 'memory': '1536Mi' } } diff --git a/logstash/values.yaml b/logstash/values.yaml index 6705565eb..68658180d 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -46,10 +46,10 @@ logstashJavaOpts: "-Xmx1g -Xms1g" resources: requests: cpu: "100m" - memory: "1280Mi" + memory: "1536Mi" limits: cpu: "1000m" - memory: "1280Mi" + memory: "1536Mi" volumeClaimTemplate: accessModes: [ "ReadWriteOnce" ]