BUG/MINOR: haproxy: Remove hardcode from configmap template for haproxy chart. (#233) (#234)

Signed-off-by: Mikhail Koniakhin <[email protected]>

Author: MemberIT

haproxy/templates/NOTES.txt

@@ -5,11 +5,16 @@ Controller image deployed is: "{{ .Values.image.repository }}:{{ tpl .Values.ima
 Your HAProxy app is of a "{{ .Values.kind }}" kind.
 
 Service ports mapped are:
+{{- $nodePorts := .Values.service.nodePorts }}
+{{- $servicePortType := .Values.service.type }}
 {{- if eq .Values.kind "Deployment" }}
 {{- range $key, $value := .Values.containerPorts }}
   - name: {{ $key }}
     containerPort: {{ $value }}
     protocol: TCP
+    {{- if and (hasKey $nodePorts $key) (eq $servicePortType "NodePort") }}
+    nodePort: {{ get $nodePorts $key }}
+    {{- end }}
 {{- end }}
 {{- end }}
 {{- if eq .Values.kind "DaemonSet" }}
@@ -22,6 +27,9 @@ Service ports mapped are:
     {{- if $useHostPort }}
     hostPort: {{ index $hostPorts $key | default $value }}
     {{- end }}
+    {{- if and (hasKey $nodePorts $key) (eq $servicePortType "NodePort") }}
+    nodePort: {{ get $nodePorts $key }}
+    {{- end }}
 {{- end }}
 {{- end }}
 

haproxy/templates/service.yaml

@@ -50,13 +50,18 @@ spec:
   {{- toYaml . | nindent 2 }}
   {{- end }}
   {{- if or .Values.containerPorts .Values.service.additionalPorts }}
+  {{- $nodePorts := .Values.service.nodePorts }}
+  {{- $servicePortType := .Values.service.type }}
   ports:
   {{- with .Values.containerPorts }}
   {{- range $key, $port := . }}
   - name: {{ $key }}
     protocol: TCP
     port: {{ $port }}
     targetPort: {{ $key }}
+  {{- if and (hasKey $nodePorts $key) (eq $servicePortType "NodePort") }}
+    nodePort: {{ get $nodePorts $key }}
+  {{- end }}
   {{- end }}
   {{- end }}
   {{- with .Values.service.additionalPorts }}
@@ -65,6 +70,9 @@ spec:
     protocol: TCP
     port: {{ $port }}
     targetPort: {{ $key }}
+  {{- if and (hasKey $nodePorts $key) (eq $servicePortType "NodePort") }}
+    nodePort: {{ get $nodePorts $key }}
+  {{- end }}
   {{- end }}
   {{- end }}
   {{- end }}

haproxy/values.yaml

@@ -449,7 +449,7 @@ PodDisruptionBudget:
 ## Service configuration
 ## ref: https://kubernetes.io/docs/concepts/services-networking/service/
 service:
-  type: ClusterIP   # can be 'LoadBalancer'
+  type: ClusterIP   # can be 'ClusterIP', 'NodePort', 'LoadBalancer'
 
   ## Service ClusterIP
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/
@@ -484,6 +484,12 @@ service:
   additionalPorts: {}
     # prometheus: 9101
 
+  ## NodePort custom port
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#nodeport-custom-port
+  nodePorts: {}
+    # http: 32080
+    # https: 32443
+
 serviceMonitor:
   ## Toggle the ServiceMonitor true if you have Prometheus Operator installed and configured
   enabled: false