MAJOR: haproxy: add support for deployment labels, raw container and service additional ports config (#303)

Author: dadangnh

haproxy/templates/daemonset.yaml

@@ -121,6 +121,9 @@ spec:
               hostPort: {{ index $hostPorts $key }}
               {{- end }}
           {{- end }}
+          {{- with .Values.rawContainerPorts }}
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.livenessProbe }}
           livenessProbe:
             {{- toYaml . | trim | nindent 12 }}

haproxy/templates/deployment.yaml

@@ -22,6 +22,9 @@ metadata:
   namespace: {{ include "haproxy.namespace" . }}
   labels:
     {{- include "haproxy.labels" . | nindent 4 }}
+    {{- if .Values.deploymentLabels }}
+{{ tpl (toYaml .Values.deploymentLabels) . | indent 4 }}
+    {{- end }}
   annotations:
     {{- if .Values.deploymentAnnotations }}
 {{ tpl (toYaml .Values.deploymentAnnotations) . | indent 4 }}
@@ -123,6 +126,9 @@ spec:
               containerPort: {{ $value }}
               protocol: TCP
           {{- end }}
+          {{- with .Values.rawContainerPorts }}
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.livenessProbe }}
           livenessProbe:
             {{- toYaml . | trim | nindent 12 }}

haproxy/templates/service.yaml

@@ -52,7 +52,7 @@ spec:
   externalIPs:
   {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- if or .Values.containerPorts .Values.service.additionalPorts }}
+  {{- if or .Values.containerPorts .Values.service.additionalPorts .Values.service.rawAdditionalPorts }}
   {{- $nodePorts := .Values.service.nodePorts }}
   {{- $servicePortType := .Values.service.type }}
   ports:
@@ -78,4 +78,7 @@ spec:
   {{- end }}
   {{- end }}
   {{- end }}
+  {{- with .Values.service.rawAdditionalPorts }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
   {{- end }}

haproxy/values.yaml

@@ -101,6 +101,9 @@ args:
 deploymentAnnotations: {}
 #  key: value
 
+deploymentLabels: {}
+#  key: value
+
 ## Controller Container liveness/readiness probe configuration
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
 livenessProbe:
@@ -174,6 +177,18 @@ containerPorts:   # has to match hostPorts when useHostNetwork is true
   https: 443
   stat: 1024
 
+## Raw container ports configuration (alternative to containerPorts for more control)
+## Allows specifying container ports in full Kubernetes format with custom protocols, names, etc.
+## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#containerport-v1-core
+rawContainerPorts: []
+# Example:
+# - containerPort: 9090
+#   name: metrics-port
+#   protocol: TCP
+# - containerPort: 8080
+#   name: custom-http
+#   protocol: TCP
+
 ## Deployment strategy definition
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
 strategy: {}
@@ -500,6 +515,20 @@ service:
   additionalPorts: {}
     # prometheus: 9101
 
+  ## Raw additional service ports configuration (alternative to additionalPorts for more control)
+  ## Allows specifying service ports in full Kubernetes format with custom protocols, names, etc.
+  ## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#serviceport-v1-core
+  rawAdditionalPorts: []
+  # Example:
+  # - name: metrics-port
+  #   port: 9090
+  #   targetPort: 9090
+  #   protocol: TCP
+  # - name: custom-service
+  #   port: 8080
+  #   targetPort: custom-http
+  #   protocol: TCP
+
   ## NodePort custom port
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#nodeport-custom-port
   nodePorts: {}