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]>
haproxytech · May 19, 2023 · 8025055 · 8025055
1 parent 84ce744
commit 8025055
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/haproxy/Chart.yaml b/haproxy/Chart.yaml
@@ -16,8 +16,8 @@ apiVersion: v2
 name: haproxy
 description: A Helm chart for HAProxy on Kubernetes
 type: application
-version: 1.18.0
-appVersion: 2.6.9
+version: 1.19.0
+appVersion: 2.7.5
 kubeVersion: ">=1.17.0-0"
 keywords:
   - haproxy
@@ -31,8 +31,6 @@ maintainers:
 engine: gotpl
 annotations:
   artifacthub.io/changes: |
-    - Update base image to HAProxy 2.6.9
-    - Update HPA API version (#172)
-    - Fix HPA spec (#173)
-    - Ensure api version capabilities of PodDisruptionBudget (#175)
-    - Add additionalPorts to service (#177)
+    - Update base image to HAProxy 2.7.5
+    - Allow changing configMount file/location for EE images
+    - Fix includesMountPath default location
diff --git a/haproxy/templates/NOTES.txt b/haproxy/templates/NOTES.txt
@@ -47,4 +47,4 @@ Node IP can be found with:
 For more examples and up to date documentation, please visit:
   * Helm chart documentation: https://github.com/haproxytech/helm-charts/tree/main/haproxy
   * HAProxy Alpine Docker container documentation: https://github.com/haproxytech/haproxy-docker-alpine
-  * HAProxy documentation: https://www.haproxy.org/download/2.2/doc/configuration.txt
+  * HAProxy documentation: https://www.haproxy.org/download/2.7/doc/configuration.txt
diff --git a/haproxy/templates/daemonset.yaml b/haproxy/templates/daemonset.yaml
@@ -153,8 +153,8 @@ spec:
           {{- end }}
           volumeMounts:
             - name: haproxy-config
-              mountPath: /usr/local/etc/haproxy/haproxy.cfg
-              subPath: haproxy.cfg
+              mountPath: {{ .Values.configMount.mountPath }}
+              subPath: {{ .Values.configMount.subPath }}
             {{- if .Values.includes }}
             - name: includes
               mountPath: {{ .Values.includesMountPath }}

diff --git a/haproxy/templates/deployment.yaml b/haproxy/templates/deployment.yaml
@@ -151,8 +151,8 @@ spec:
           {{- end }}
           volumeMounts:
             - name: haproxy-config
-              mountPath: /usr/local/etc/haproxy/haproxy.cfg
-              subPath: haproxy.cfg
+              mountPath: {{ .Values.configMount.mountPath }}
+              subPath: {{ .Values.configMount.subPath }}
             {{- if .Values.includes }}
             - name: includes
               mountPath: {{ .Values.includesMountPath }}

diff --git a/haproxy/values.yaml b/haproxy/values.yaml
@@ -47,6 +47,7 @@ shareProcessNamespace:
 # ref: https://kubernetes.io/docs/concepts/workloads/pods/#workload-resources-for-managing-pods
 # ref: https://kubernetes.io/docs/concepts/workloads/pods/#how-pods-manage-multiple-containers
 sidecarContainers: []
+
 ## Reflex
 # ref: https://github.com/cespare/reflex
 # ref: https://hub.docker.com/r/acim/go-reflex
@@ -90,7 +91,7 @@ minReadySeconds: 0
 ## Command line arguments to pass to HAProxy
 args:
   enabled: true    # EE images require disabling this due to S6-overlay
-  # ref: http://cbonte.github.io/haproxy-dconv/2.2/management.html#3
+  # ref: http://cbonte.github.io/haproxy-dconv/2.6/management.html#3
   defaults: ["-f", "/usr/local/etc/haproxy/haproxy.cfg"]
   extraArgs: []    # EE images require disabling this due to S6-overlay
 
@@ -216,7 +217,7 @@ extraVolumes: []
 #   emptyDir: {}
 
 ## HAProxy daemon configuration
-# ref: https://www.haproxy.org/download/2.2/doc/configuration.txt
+# ref: https://www.haproxy.org/download/2.6/doc/configuration.txt
 config: |
   global
     log stdout format raw local0
@@ -235,9 +236,14 @@ config: |
   backend be_main
     server web1 10.0.0.1:8080 check
 
+# Mount path and sub path for config file
+configMount:
+  mountPath: /usr/local/etc/haproxy/haproxy.cfg    # EE images use /etc/hapee-VERSION/hapee-lb.cfg
+  subPath: haproxy.cfg                             # EE images use hapee-lb.cfg
+
 ## Basic features : Maps
-# ref: http://cbonte.github.io/haproxy-dconv/2.2/configuration.html#7.3.1-map
-# ref: http://cbonte.github.io/haproxy-dconv/2.2/intro.html#3.3.8
+# ref: http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#7.3.1-map
+# ref: http://cbonte.github.io/haproxy-dconv/2.6/intro.html#3.3.8
 includes:
   # routes.map: |
   #   www.example.com/v1     www.example2.com/v2
@@ -252,8 +258,8 @@ includes:
   #   Check passed.
   #   </body></html>
 
-## Mount path includes file and maps
-includesMountPath: /etc/haproxy
+## Mount path for includes and maps
+includesMountPath: /usr/local/etc/haproxy         # 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