fix typo on Readme and consitency

Author: rwinieski

README.md

@@ -195,9 +195,9 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
 | `haproxy.service.type`                              | The service type of the HAproxy                                                                                                                                                        | `ClusterIP`                |
 | `haproxy.pathbased.enabled`                         | Parameter to enable path based routing on the HAProxy Load Balancer for MarkLogic       | `false`                    |
 | `haproxy.frontendPort`                              | Listening port in the Front-End section of the HAProxy when using Path based routing | `443`                  |
-| `haproxy.DefaultAppappservices.path`                | Path used to expose MarkLogic App-Services App-Server                           | `""`                     |
-| `haproxy.DefaultAppadmin.path`                      | Path used to expose MarkLogic Admin App-Server                                  | `""`                     |
-| `haproxy.DefaultAppmanage.path`                     | Path used to expose the MarkLogic Manage App-Server                             | `""`                     |
+| `haproxy.DefaultApp.appservices.path`                | Path used to expose MarkLogic App-Services App-Server                           | `""`                     |
+| `haproxy.DefaultApp.admin.path`                      | Path used to expose MarkLogic Admin App-Server                                  | `""`                     |
+| `haproxy.DefaultApp.manage.path`                     | Path used to expose the MarkLogic Manage App-Server                             | `""`                     |
 | `haproxy.additionalAppServers`                      | List of additional HTTP Ports configuration for HAproxy                         | `[]`                     |
 | `haproxy.tcpports.enabled`                          | Parameter to enable TCP port routing on HAProxy                              | `false`                  |
 | `haproxy.tcpports`                                  | TCP Ports and load balancing type configuration for HAproxy                  | `[]`                     |

charts/templates/configmap-haproxy-pathbased.yaml

@@ -5,7 +5,7 @@
 {{- $namespace := .Release.Namespace }}
 {{- $clusterDomain := .Values.clusterDomain }}
 {{- $haproxyTlsEnabled := .Values.haproxy.tls.enabled }}
-{{- $appServerTlsEnabled := .Values.tls.enableOnDefaultAppServers -}}
+{{- $appServerTlsEnabled := .Values.tls.enableOnDefaultAppServers }}
 {{- $certFileName := .Values.haproxy.tls.certFileName }}
 {{- $appservicespath := .Values.haproxy.defaultAppServers.appservices.path }}
 {{- $adminpath := .Values.haproxy.defaultAppServers.admin.path }}

charts/templates/configmap-haproxy.yaml

@@ -1,12 +1,12 @@
 {{- if .Values.haproxy.enabled }}
-{{- if not .Values.haproxy.pathbased.enabled -}}
-{{- $replicas := int .Values.replicaCount -}}
-{{- $releaseName := include "marklogic.fullname" . -}}
-{{- $namespace := .Release.Namespace -}}
-{{- $clusterDomain := .Values.clusterDomain -}}
-{{- $haproxyTlsEnabled := .Values.haproxy.tls.enabled -}}
-{{- $appServerTlsEnabled := .Values.tls.enableOnDefaultAppServers -}}
-{{- $certFileName := .Values.haproxy.tls.certFileName -}}
+{{- if not .Values.haproxy.pathbased.enabled }}
+{{- $replicas := int .Values.replicaCount }}
+{{- $releaseName := include "marklogic.fullname" . }}
+{{- $namespace := .Release.Namespace }}
+{{- $clusterDomain := .Values.clusterDomain }}
+{{- $haproxyTlsEnabled := .Values.haproxy.tls.enabled }}
+{{- $appServerTlsEnabled := .Values.tls.enableOnDefaultAppServers }}
+{{- $certFileName := .Values.haproxy.tls.certFileName }}
 
 apiVersion: v1
 kind: ConfigMap