From 418dd3585b2c86362465edfaf65eb9ae757f2408 Mon Sep 17 00:00:00 2001
From: Simon <simon@gurcke.de>
Date: Wed, 12 Aug 2020 12:25:06 +1000
Subject: [PATCH 1/3] Fix ports

---
 logstash/templates/service-headless.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/logstash/templates/service-headless.yaml b/logstash/templates/service-headless.yaml
index 2bf840b34..476a25c22 100644
--- a/logstash/templates/service-headless.yaml
+++ b/logstash/templates/service-headless.yaml
@@ -16,8 +16,4 @@ spec:
   selector:
     app: "{{ template "logstash.fullname" . }}"
   ports:
-  - name: http
-    port: {{ .Values.httpPort }}
-{{- if .Values.extraPorts }}
-{{- toYaml .Values.extraPorts | nindent 2 }}
-{{- end }}
+{{ toYaml .Values.service.ports | indent 4 }}

From 6ee6adf390dfd11a4f79d5737827a1677891fd6f Mon Sep 17 00:00:00 2001
From: Simon <simon@gurcke.de>
Date: Wed, 12 Aug 2020 13:09:54 +1000
Subject: [PATCH 2/3] Don't require service to be defined in values.yaml

---
 logstash/templates/service-headless.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/logstash/templates/service-headless.yaml b/logstash/templates/service-headless.yaml
index 476a25c22..157e4a66f 100644
--- a/logstash/templates/service-headless.yaml
+++ b/logstash/templates/service-headless.yaml
@@ -16,4 +16,9 @@ spec:
   selector:
     app: "{{ template "logstash.fullname" . }}"
   ports:
+{{- if .Values.service }}
 {{ toYaml .Values.service.ports | indent 4 }}
+{{- else }}
+    - name: http
+      port: {{ .Values.httpPort }}
+{{- end }}

From 1137a6034d7bf4118b316dc5efe1f2c33c0778f7 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Wed, 26 Aug 2020 11:40:16 +0200
Subject: [PATCH 3/3] [logstash] add headless service port test

---
 logstash/tests/logstash_test.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py
index 6b29dacdf..a96ce0a20 100755
--- a/logstash/tests/logstash_test.py
+++ b/logstash/tests/logstash_test.py
@@ -860,6 +860,13 @@ def test_adding_a_service():
         "protocol": "TCP",
         "targetPort": 5044,
     }
+    h = r["service"][name + "-headless"]
+    assert h["spec"]["ports"][0] == {
+        "name": "beats",
+        "port": 5044,
+        "protocol": "TCP",
+        "targetPort": 5044,
+    }
 
 
 def test_setting_fullnameOverride():