BUG: haproxy: includes name in haproxy charts

Signed-off-by: Muhammad Abduh <[email protected]>

Author: dkorunic

haproxy/templates/daemonset.yaml

@@ -87,7 +87,7 @@ spec:
           projected:
             sources:
             - configMap:
-                name: includes
+                name: {{ include "haproxy.includes" . }}
         {{- end }}
         {{- range $mountedSecret := .Values.mountedSecrets }}
         - name: {{ $mountedSecret.volumeName }}

haproxy/templates/deployment.yaml

@@ -88,7 +88,7 @@ spec:
           projected:
             sources:
             - configMap:
-                name: includes
+                name: {{ include "haproxy.includes" . }}
         {{- end }}
         {{- range $mountedSecret := .Values.mountedSecrets }}
         - name: {{ $mountedSecret.volumeName }}

haproxy/values.yaml

@@ -259,7 +259,7 @@ includes:
   #   </body></html>
 
 ## Mount path for includes and maps
-includesMountPath: /usr/local/etc/haproxy         # EE images use /etc/hapee-VERSION
+includesMountPath: /usr/local/etc/haproxy/includes         # EE images use /etc/hapee-VERSION
 
 ## Additional secrets to mount as volumes
 ## This is expected to be an array of dictionaries specifying the volume name, secret name and mount path