Add resources to ES sidecar container.

elasticsearch/README.md

@@ -77,6 +77,7 @@ helm install --name elasticsearch elastic/elasticsearch --version 7.1.1 --set im
 | `esJavaOpts`               | [Java options](https://www.elastic.co/guide/en/elasticsearch/reference/current/jvm-options.html) for Elasticsearch. This is where you should configure the [jvm heap size](https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html)                                                                 | `-Xmx1g -Xms1g`                                                                                                           |
 | `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`                             |
 | `initResources`            | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the initContainer in the statefulset                                                                                                                                                          | {}                                                                                                                        |
+| `sidecarResources`         | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the sidecar containers in the statefulset                                                                                                                                                     | {}                                                                                                                        |
 | `networkHost`              | Value for the [network.host Elasticsearch setting](https://www.elastic.co/guide/en/elasticsearch/reference/current/network.host.html)                                                                                                                                                                                      | `0.0.0.0`                                                                                                                 |
 | `volumeClaimTemplate`      | Configuration for the [volumeClaimTemplate for statefulsets](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-storage). You will want to adjust the storage (default `30Gi`) and the `storageClassName` if you are using a different storage class                                            | `accessModes: [ "ReadWriteOnce" ]`<br>`resources.requests.storage: 30Gi`                                                  |
 | `persistence.annotations`  | Additional persistence annotations for the `volumeClaimTemplate`                                                                                                                                                                                                                                                           | `{}`                                                                                                                      |

elasticsearch/templates/statefulset.yaml

@@ -263,6 +263,8 @@ spec:
 
           sleep infinity &
           wait $!
+        resources:
+{{ toYaml .Values.sidecarResources | indent 10 }}
         env:
           - name: NODE_NAME
             valueFrom:

elasticsearch/tests/elasticsearch_test.py

@@ -459,6 +459,30 @@ def test_adding_resources_to_initcontainer():
         }
     }
 
+def test_adding_resources_to_sidecar_container():
+    config = '''
+sidecarResources:
+  limits:
+    cpu: "100m"
+    memory: "128Mi"
+  requests:
+    cpu: "100m"
+    memory: "128Mi"
+'''
+    r = helm_template(config)
+    i = r['statefulset'][uname]['spec']['template']['spec']['containers'][1]
+
+    assert i['resources'] == {
+        'requests': {
+            'cpu': '100m',
+            'memory': '128Mi'
+        },
+        'limits': {
+            'cpu': '100m',
+            'memory': '128Mi'
+        }
+    }
+
 def test_adding_a_node_affinity():
     config = '''
 nodeAffinity:

elasticsearch/values.yaml

@@ -67,6 +67,14 @@ initResources: {}
   #   cpu: "25m"
   #   memory: "128Mi"
 
+sidecarResources: {}
+  # limits:
+  #   cpu: "25m"
+  #   # memory: "128Mi"
+  # requests:
+  #   cpu: "25m"
+  #   memory: "128Mi"
+
 networkHost: "0.0.0.0"
 
 volumeClaimTemplate: