logs: support .Values.sevice.extraPorts. fixes #2111

Author: AndrewChubatiuk

charts/victoria-logs-single/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Next release
 
 - updated common dependency 0.0.39 -> 0.0.42
+- add .Values.service.extraPorts. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/2111).
 
 ## 0.9.3
 

charts/victoria-logs-single/Chart.yaml

@@ -3,7 +3,7 @@ type: application
 appVersion: v1.16.0
 description: Victoria Logs Single version - high-performance, cost-effective and scalable logs storage
 name: victoria-logs-single
-version: 0.9.3
+version: 0.9.4
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 icon: https://avatars.githubusercontent.com/u/43720803?s=200&v=4

charts/victoria-logs-single/templates/server-service.yaml

@@ -58,5 +58,11 @@ spec:
       {{- with $service.nodePort }}
       nodePort: {{ . }}
       {{- end }}
+    {{- range $service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .port }}
+      protocol: {{ .protocol | default "TCP" }}
+      targetPort: {{ .targetPort }}
+    {{- end }}
   selector: {{ include "vm.selectorLabels" $ctx | nindent 4 }}
 {{- end }}

charts/victoria-logs-single/values.yaml

@@ -286,6 +286,8 @@ server:
     # nodePort: 30000
     # -- Service type
     type: ClusterIP
+    # -- Extra service ports
+    extraPorts: []
     # -- Service external traffic policy. Check [here](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip) for details
     externalTrafficPolicy: ""
     # -- Health check node port for a service. Check [here](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip) for details

charts/victoria-metrics-cluster/templates/_helpers.tpl

@@ -158,7 +158,7 @@
 
 {{- define "vmselect.ports" -}}
 {{- $service := .service }}
-{{- $extraArgs := .extraArgs }}
+{{- $extraArgs := .extraArgs -}}
 - name: http
   port: {{ $service.servicePort }}
   protocol: TCP
@@ -179,15 +179,15 @@
 
 {{- define "vminsert.ports" -}}
 {{- $service := .service }}
-{{- $extraArgs := .extraArgs }}
+{{- $extraArgs := .extraArgs -}}
 - name: http
   port: {{ $service.servicePort }}
   protocol: TCP
   targetPort: {{ $service.targetPort }}
 {{- range $service.extraPorts }}
 - name: {{ .name }}
   port: {{ .port }}
-  protocol: TCP
+  protocol: {{ .protocol | default "TCP" }}
   targetPort: {{ .targetPort }}
 {{- end }}
 {{- with $extraArgs.clusternativeListenAddr }}
@@ -236,7 +236,7 @@
 {{- end -}}
 
 {{- define "vmstorage.ports" -}}
-{{- $service := .service }}
+{{- $service := .service -}}
 - port: {{ $service.servicePort }}
   targetPort: http
   protocol: TCP
@@ -258,7 +258,7 @@
 {{- end -}}
 
 {{- define "vmauth.ports" -}}
-{{- $service := .service }}
+{{- $service := .service -}}
 - port: {{ $service.servicePort }}
   targetPort: http
   protocol: TCP