Skip to content

Commit 8025055

Browse files
committed
RELEASE/MAJOR: haproxy: Tag release 1.19.0
Changes in haproxy: - Update base image to HAProxy 2.7.5 - Allow changing configMount file/location for EE images - Fix includesMountPath default location Signed-off-by: Dinko Korunic <[email protected]>
1 parent 84ce744 commit 8025055

File tree

5 files changed

+22
-18
lines changed

5 files changed

+22
-18
lines changed

haproxy/Chart.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ apiVersion: v2
1616
name: haproxy
1717
description: A Helm chart for HAProxy on Kubernetes
1818
type: application
19-
version: 1.18.0
20-
appVersion: 2.6.9
19+
version: 1.19.0
20+
appVersion: 2.7.5
2121
kubeVersion: ">=1.17.0-0"
2222
keywords:
2323
- haproxy
@@ -31,8 +31,6 @@ maintainers:
3131
engine: gotpl
3232
annotations:
3333
artifacthub.io/changes: |
34-
- Update base image to HAProxy 2.6.9
35-
- Update HPA API version (#172)
36-
- Fix HPA spec (#173)
37-
- Ensure api version capabilities of PodDisruptionBudget (#175)
38-
- Add additionalPorts to service (#177)
34+
- Update base image to HAProxy 2.7.5
35+
- Allow changing configMount file/location for EE images
36+
- Fix includesMountPath default location

haproxy/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ Node IP can be found with:
4747
For more examples and up to date documentation, please visit:
4848
* Helm chart documentation: https://github.com/haproxytech/helm-charts/tree/main/haproxy
4949
* HAProxy Alpine Docker container documentation: https://github.com/haproxytech/haproxy-docker-alpine
50-
* HAProxy documentation: https://www.haproxy.org/download/2.2/doc/configuration.txt
50+
* HAProxy documentation: https://www.haproxy.org/download/2.7/doc/configuration.txt

haproxy/templates/daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ spec:
153153
{{- end }}
154154
volumeMounts:
155155
- name: haproxy-config
156-
mountPath: /usr/local/etc/haproxy/haproxy.cfg
157-
subPath: haproxy.cfg
156+
mountPath: {{ .Values.configMount.mountPath }}
157+
subPath: {{ .Values.configMount.subPath }}
158158
{{- if .Values.includes }}
159159
- name: includes
160160
mountPath: {{ .Values.includesMountPath }}

haproxy/templates/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ spec:
151151
{{- end }}
152152
volumeMounts:
153153
- name: haproxy-config
154-
mountPath: /usr/local/etc/haproxy/haproxy.cfg
155-
subPath: haproxy.cfg
154+
mountPath: {{ .Values.configMount.mountPath }}
155+
subPath: {{ .Values.configMount.subPath }}
156156
{{- if .Values.includes }}
157157
- name: includes
158158
mountPath: {{ .Values.includesMountPath }}

haproxy/values.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ shareProcessNamespace:
4747
# ref: https://kubernetes.io/docs/concepts/workloads/pods/#workload-resources-for-managing-pods
4848
# ref: https://kubernetes.io/docs/concepts/workloads/pods/#how-pods-manage-multiple-containers
4949
sidecarContainers: []
50+
5051
## Reflex
5152
# ref: https://github.com/cespare/reflex
5253
# ref: https://hub.docker.com/r/acim/go-reflex
@@ -90,7 +91,7 @@ minReadySeconds: 0
9091
## Command line arguments to pass to HAProxy
9192
args:
9293
enabled: true # EE images require disabling this due to S6-overlay
93-
# ref: http://cbonte.github.io/haproxy-dconv/2.2/management.html#3
94+
# ref: http://cbonte.github.io/haproxy-dconv/2.6/management.html#3
9495
defaults: ["-f", "/usr/local/etc/haproxy/haproxy.cfg"]
9596
extraArgs: [] # EE images require disabling this due to S6-overlay
9697

@@ -216,7 +217,7 @@ extraVolumes: []
216217
# emptyDir: {}
217218

218219
## HAProxy daemon configuration
219-
# ref: https://www.haproxy.org/download/2.2/doc/configuration.txt
220+
# ref: https://www.haproxy.org/download/2.6/doc/configuration.txt
220221
config: |
221222
global
222223
log stdout format raw local0
@@ -235,9 +236,14 @@ config: |
235236
backend be_main
236237
server web1 10.0.0.1:8080 check
237238
239+
# Mount path and sub path for config file
240+
configMount:
241+
mountPath: /usr/local/etc/haproxy/haproxy.cfg # EE images use /etc/hapee-VERSION/hapee-lb.cfg
242+
subPath: haproxy.cfg # EE images use hapee-lb.cfg
243+
238244
## Basic features : Maps
239-
# ref: http://cbonte.github.io/haproxy-dconv/2.2/configuration.html#7.3.1-map
240-
# ref: http://cbonte.github.io/haproxy-dconv/2.2/intro.html#3.3.8
245+
# ref: http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#7.3.1-map
246+
# ref: http://cbonte.github.io/haproxy-dconv/2.6/intro.html#3.3.8
241247
includes:
242248
# routes.map: |
243249
# www.example.com/v1 www.example2.com/v2
@@ -252,8 +258,8 @@ includes:
252258
# Check passed.
253259
# </body></html>
254260

255-
## Mount path includes file and maps
256-
includesMountPath: /etc/haproxy
261+
## Mount path for includes and maps
262+
includesMountPath: /usr/local/etc/haproxy # EE images use /etc/hapee-VERSION
257263

258264
## Additional secrets to mount as volumes
259265
## This is expected to be an array of dictionaries specifying the volume name, secret name and mount path

0 commit comments

Comments
 (0)