Skip to content

Commit f7783cf

Browse files
rwinieskirwinieski
committed
combine haproxy configmap
1 parent 459b4e9 commit f7783cf

File tree

2 files changed

+117
-206
lines changed

2 files changed

+117
-206
lines changed

‎charts/templates/configmap-haproxy-pathbased.yaml

Lines changed: 0 additions & 196 deletions
This file was deleted.

‎charts/templates/configmap-haproxy.yaml

Lines changed: 117 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{{- if .Values.haproxy.enabled }}
2-
{{- if not .Values.haproxy.pathbased.enabled }}
32
{{- $replicas := int .Values.replicaCount }}
43
{{- $releaseName := include "marklogic.fullname" . }}
54
{{- $namespace := .Release.Namespace }}
65
{{- $clusterDomain := .Values.clusterDomain }}
76
{{- $haproxyTlsEnabled := .Values.haproxy.tls.enabled }}
87
{{- $appServerTlsEnabled := .Values.tls.enableOnDefaultAppServers }}
98
{{- $certFileName := .Values.haproxy.tls.certFileName }}
10-
9+
{{- $appservicespath := .Values.haproxy.defaultAppServers.appservices.path }}
10+
{{- $adminpath := .Values.haproxy.defaultAppServers.admin.path }}
11+
{{- $managepath := .Values.haproxy.defaultAppServers.manage.path }}
1112
apiVersion: v1
1213
kind: ConfigMap
1314
metadata:
@@ -24,9 +25,9 @@ data:
2425
defaults
2526
log global
2627
option forwardfor
27-
timeout client 60s
28-
timeout connect 60s
29-
timeout server 60s
28+
timeout client 600s
29+
timeout connect 600s
30+
timeout server 600s
3031
3132
resolvers dns
3233
# add nameserver from /etc/resolv.conf
@@ -57,6 +58,7 @@ data:
5758
# How long to wait for a successful resolution
5859
timeout resolve 5s
5960
61+
6062
{{- if .Values.haproxy.stats.enabled }}
6163
frontend stats
6264
mode http
@@ -71,8 +73,6 @@ data:
7173
stats admin if LOCALHOST
7274
{{- end }}
7375
74-
75-
7676
{{- if .Values.haproxy.tcpports.enabled }}
7777
{{- range $_, $v := .Values.haproxy.tcpports.ports }}
7878
{{ $portNumber := printf "%v" (default $v.port $v.targetPort) }}
@@ -81,11 +81,119 @@ data:
8181
mode tcp
8282
balance leastconn
8383
{{- range $i := until $replicas }}
84-
server {{ printf "%s-%s-%v" $releaseName $portNumber $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:{{ $portNumber }} check resolvers dns init-addr none
84+
server {{ printf "ml-%s-%s-%v" $releaseName $portNumber $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:{{ $portNumber }} check resolvers dns init-addr none
8585
{{- end }}
8686
{{- end }}
8787
{{- end }}
8888
89+
{{- if .Values.haproxy.pathbased.enabled }}
90+
91+
frontend marklogic
92+
mode http
93+
option httplog
94+
bind :{{ .Values.haproxy.frontendPort }}
95+
http-request set-header Host {{ $releaseName }}:80
96+
http-request set-header REFERER http://{{ $releaseName }}:80
97+
http-request set-header X-ML-QC-Path "{{ $appservicespath }}"
98+
http-request set-header X-ML-ADM-Path "{{ $adminpath }}"
99+
http-request set-header X-ML-MNG-Path "{{ $managepath }}"
100+
use_backend marklogic-app-services if { path {{ $appservicespath }} } || { path_beg {{ $appservicespath }}/ }
101+
use_backend marklogic-admin if { path {{ $adminpath }} } || { path_beg {{ $adminpath }}/ }
102+
use_backend marklogic-manage if { path {{ $managepath }} } || { path_beg {{ $managepath }}/ }
103+
{{- range $_, $v := .Values.haproxy.additionalAppServers }}
104+
{{ $portNumber := printf "%v" (default $v.port $v.targetPort) }}
105+
{{ $path := printf "%v" (default $v.path)}}
106+
use_backend marklogic-{{$portNumber}} if { path {{ $path }} } || { path_beg {{ $path }}/ }
107+
{{- end }}
108+
109+
backend marklogic-app-services
110+
mode http
111+
balance leastconn
112+
option forwardfor
113+
http-request replace-path {{ $appservicespath }}(/)?(.*) /\2
114+
cookie haproxy insert indirect nocache maxidle 30m maxlife 4h
115+
stick-table type string len 32 size 10k expire 4h
116+
stick store-response res.cook(HostId)
117+
stick store-response res.cook(SessionId)
118+
stick match req.cook(HostId)
119+
stick match req.cook(SessionId)
120+
default-server check
121+
{{- range $i := until $replicas }}
122+
{{- if $appServerTlsEnabled }}
123+
server {{ $releaseName }}-appservices-{{ $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:8000 resolvers dns init-addr none cookie {{ $releaseName }}-appservices-{{ $i }} ssl verify none
124+
{{- else }}
125+
server {{ $releaseName }}-appservices-{{ $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:8000 resolvers dns init-addr none cookie {{ $releaseName }}-appservices-{{ $i }}
126+
{{- end }}
127+
{{- end }}
128+
129+
backend marklogic-admin
130+
mode http
131+
balance leastconn
132+
option forwardfor
133+
http-request replace-path {{ $adminpath }}(/)?(.*) /\2
134+
cookie haproxy insert indirect nocache maxidle 30m maxlife 4h
135+
stick-table type string len 32 size 10k expire 4h
136+
stick store-response res.cook(HostId)
137+
stick store-response res.cook(SessionId)
138+
stick match req.cook(HostId)
139+
stick match req.cook(SessionId)
140+
default-server check
141+
{{- range $i := until $replicas }}
142+
{{- if $appServerTlsEnabled }}
143+
server {{ $releaseName }}-admin-{{ $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:8001 resolvers dns init-addr none cookie {{ $releaseName }}-admin-{{ $i }} ssl verify none
144+
{{- else }}
145+
server {{ $releaseName }}-admin-{{ $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:8001 resolvers dns init-addr none cookie {{ $releaseName }}-admin-{{ $i }}
146+
{{- end }}
147+
{{- end }}
148+
149+
backend marklogic-manage
150+
mode http
151+
balance leastconn
152+
option forwardfor
153+
http-request replace-path {{ $managepath }}(/)?(.*) /\2
154+
cookie haproxy insert indirect nocache maxidle 30m maxlife 4h
155+
stick-table type string len 32 size 10k expire 4h
156+
stick store-response res.cook(HostId)
157+
stick store-response res.cook(SessionId)
158+
stick match req.cook(HostId)
159+
stick match req.cook(SessionId)
160+
default-server check
161+
{{- range $i := until $replicas }}
162+
{{- if $appServerTlsEnabled }}
163+
server {{ $releaseName }}-manage-{{ $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:8002 resolvers dns init-addr none cookie {{ $releaseName }}-manage-{{ $i }} ssl verify none
164+
{{- else }}
165+
server {{ $releaseName }}-manage-{{ $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:8002 resolvers dns init-addr none cookie {{ $releaseName }}-manage-{{ $i }}
166+
{{- end }}
167+
{{- end }}
168+
169+
{{- range $_, $v := .Values.haproxy.additionalAppServers }}
170+
{{ $portNumber := printf "%v" (default $v.port $v.targetPort) }}
171+
{{ $portType := upper (printf "%s" $v.type) }}
172+
{{ $path := printf "%v" (default $v.path)}}
173+
174+
backend marklogic-{{$portNumber}}
175+
mode http
176+
balance leastconn
177+
option forwardfor
178+
http-request replace-path {{$path}}(/)?(.*) /\2
179+
cookie haproxy insert indirect nocache maxidle 30m maxlife 4h
180+
stick-table type string len 32 size 10k expire 4h
181+
stick store-response res.cook(HostId)
182+
stick store-response res.cook(SessionId)
183+
stick match req.cook(HostId)
184+
stick match req.cook(SessionId)
185+
default-server check
186+
{{- range $i := until $replicas }}
187+
{{- if $appServerTlsEnabled }}
188+
server {{ printf "ml-%s-%s-%v" $releaseName $portNumber $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:{{ $portNumber }} resolvers dns init-addr none cookie {{ $releaseName }}-{{ $portNumber }}-{{ $i }} ssl verify none
189+
{{- else }}
190+
server {{ printf "ml-%s-%s-%v" $releaseName $portNumber $i }} {{ $releaseName }}-{{ $i }}.{{ $releaseName }}.{{ $namespace }}.svc.{{ $clusterDomain }}:{{ $portNumber }} resolvers dns init-addr none cookie {{ $releaseName }}-{{ $portNumber }}-{{ $i }}
191+
{{- end }}
192+
{{- end }}
193+
{{- end }}
194+
195+
{{- else }}
196+
89197
frontend marklogic-appservices
90198
mode http
91199
{{- if $haproxyTlsEnabled }}
@@ -206,7 +314,6 @@ data:
206314
{{- end }}
207315
{{- end }}
208316
{{- end }}
317+
{{- end }}
209318
210-
211-
{{- end }}
212319
{{- end }}

0 commit comments

Comments
 (0)