[logstash] Fix headless service ports spec (elastic#776)

Co-authored-by: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
jmlrt · Aug 27, 2020 · 8ed75a9 · 8ed75a9
1 parent fb65759
commit 8ed75a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/logstash/templates/service-headless.yaml b/logstash/templates/service-headless.yaml
@@ -16,8 +16,9 @@ spec:
   selector:
     app: "{{ template "logstash.fullname" . }}"
   ports:
-  - name: http
-    port: {{ .Values.httpPort }}
-{{- if .Values.extraPorts }}
-{{- toYaml .Values.extraPorts | nindent 2 }}
+{{- if .Values.service }}
+{{ toYaml .Values.service.ports | indent 4 }}
+{{- else }}
+    - name: http
+      port: {{ .Values.httpPort }}
 {{- end }}
diff --git 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():