[stable/graylog] Add support for a single LB for all inputs

Opens up the option to host all inputs behind a single service instead of requiring n+2 services for UDP and TCP Signed-off-by: Chris Barton <chris.barton@recurly.com>
helm · Mar 16, 2020 · 33fcf04 · 33fcf04
1 parent e8862ec
commit 33fcf04
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/stable/graylog/README.md b/stable/graylog/README.md
@@ -112,6 +112,7 @@ The following table lists the configurable parameters of the Graylog chart and t
 | `graylog.additionalJavaOpts`            | Graylog service additional `JAVA_OPTS`                                                                                                                | ``                                    |
 | `graylog.service.type`                  | Kubernetes Service type                                                                                                                               | `ClusterIP`                           |
 | `graylog.service.port`                  | Graylog Service port                                                                                                                                  | `9000`                                |
+| `graylog.service.ports`                 | Graylog Service extra ports                                                                                                                           | `[]`                                  |
 | `graylog.service.master.enabled`        | If true, Graylog Master Service will be created                                                                                                       | `true`                                |
 | `graylog.service.master.port`           | Graylog Master Service port                                                                                                                           | `9000`                                |
 | `graylog.service.master.annotations`    | Graylog Master Service annotations                                                                                                                    | `{}`                                  |
@@ -203,6 +204,19 @@ You can enable input ports by edit the `input` values. For example, you want to
           port: 5410
 ```
 
+OR, if you want to expose only a single service with all the input ports open, you can do so by specifying the `service.ports` value:
+
+```
+  service:
+    ports:
+      - name: gelf
+        port: 12222
+        protocol: TCP
+      - name: syslog
+        port: 5410
+        protocol: UDP
+```
+
 Note: Name must be in IANA_SVC_NAME (at most 15 characters, matching regex [a-z0-9]([a-z0-9-]*[a-z0-9])* and it must contains at least one letter [a-z], hyphens cannot be adjacent to other hyphens)
 
 Note: The port list should be sorted by port number.

diff --git a/stable/graylog/templates/statefulset.yaml b/stable/graylog/templates/statefulset.yaml
@@ -123,6 +123,11 @@ spec:
           ports:
             - containerPort: 9000
               name: graylog
+          {{- range .Values.graylog.service.ports }}
+            - containerPort: {{ .port }}
+              name: {{ .name}}
+              protocol: {{ .protocol }}
+          {{- end }}
           {{- with .Values.graylog.input }}
           {{- if .udp }}
           {{- range .udp.ports }}
@@ -220,7 +225,7 @@ spec:
         - name: kubectl
           emptyDir: {}
 {{- if .Values.graylog.extraVolumes }}
-{{ toYaml .Values.graylog.extraVolumes | indent 8}}
+{{ toYaml .Values.graylog.extraVolumes | indent 8 }}
 {{- end }}
 {{- if not .Values.graylog.persistence.enabled }}
         - name: journal

diff --git a/stable/graylog/templates/web-service.yaml b/stable/graylog/templates/web-service.yaml
@@ -20,6 +20,12 @@ spec:
       nodePort:  {{ .Values.graylog.service.nodePort }}
   {{- end }}
 {{- end }}
+{{- range .Values.graylog.service.ports }}
+    - name: {{ .name }}
+      port: {{ .port }}
+      protocol: {{ .protocol }}
+      targetPort: {{ .port }}
+{{- end }}
 {{- if .Values.graylog.service.externalIPs }}
   externalIPs:
 {{ toYaml .Values.graylog.service.externalIPs | indent 4 }}
@@ -28,7 +34,7 @@ spec:
   {{- if .Values.graylog.service.clusterIP }}
   clusterIP:  {{ .Values.graylog.service.clusterIP }}
   {{- end }}
-{{- end }}  
+{{- end }}
   selector:
     app.kubernetes.io/name: {{ template "graylog.name" . }}
     app.kubernetes.io/instance: "{{ .Release.Name }}"

diff --git a/stable/graylog/values.yaml b/stable/graylog/values.yaml
@@ -127,6 +127,9 @@ graylog:
   service:
     type: ClusterIP
     port: 9000
+    ## Add additional ports for the service/statefulset to expose
+    ##
+    ports: []
 
     headless:
       ## Add suffix to headless service name