Merge pull request #505 from ChiefAlexander/master

Update logstash chart to support custom ports
elastic · Mar 9, 2020 · a0e8d77 · a0e8d77
2 parents a0749c3 + 3f87ed9
commit a0e8d77
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/logstash/README.md b/logstash/README.md
@@ -73,6 +73,7 @@ helm install --name logstash elastic/logstash --set imageTag=7.6.1
 | `imagePullSecrets`            | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image                                                                                                       | `[]`                                                                                                                       |
 | `imageTag`                    | The Logstash docker image tag                                                                                                                                                                                                                                                                                              | `7.6.1`                                                                                                                    |
 | `httpPort`                    | The http port that Kubernetes will use for the healthchecks and the service.                                                                                                                                                                                                                                               | `9600`                                                                                                                     |
+| `extraPorts`                    | An array of extra ports to open on the pod                                                                                                                                                                                                                                                | `[]`                                                                                                                     |
 | `labels`                      | Configurable [labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Logstash pods                                                                                                                                                                                              | `{}`                                                                                                                       |
 | `lifecycle`                   | Allows you to add lifecycle configuration. See [values.yaml](https://github.com/elastic/helm-charts/tree/master/logstash/values.yaml) for an example of the formatting.                                                                                                                                                    | `{}`                                                                                                                       |
 | `livenessProbe`               | Configuration fields for the [livenessProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/)                                                                                                                                                                                | `failureThreshold: 3`<br>`initialDelaySeconds: 300`<br>`periodSeconds: 10`<br>`successThreshold: 3`<br>`timeoutSeconds: 5` |

diff --git a/logstash/templates/statefulset.yaml b/logstash/templates/statefulset.yaml
@@ -150,6 +150,9 @@ spec:
         ports:
         - name: http
           containerPort: {{ .Values.httpPort }}
+      {{- if .Values.extraPorts }}
+        {{- toYaml .Values.extraPorts | nindent 8 }}  
+      {{- end }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         env:

diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py
@@ -180,6 +180,19 @@ def test_adding_a_extra_container():
     } in extraContainer
 
 
+def test_adding_a_extra_port():
+    config = """
+extraPorts:
+  - name: foo
+    containerPort: 30000
+"""
+    r = helm_template(config)
+    extraPorts = r["statefulset"][name]["spec"]["template"]["spec"]["containers"][0][
+        "ports"
+    ]
+    assert {"name": "foo", "containerPort": 30000,} in extraPorts
+
+
 def test_adding_a_extra_init_container():
     config = """
 extraInitContainers: |

diff --git a/logstash/values.yaml b/logstash/values.yaml
@@ -125,6 +125,11 @@ podManagementPolicy: "Parallel"
 
 httpPort: 9600
 
+# Custom ports to add to logstash
+extraPorts: []
+  # - name: beats
+  #   containerPort: 5001
+
 updateStrategy: RollingUpdate
 
 # This is the max unavailable setting for the pod disruption budget