Skip to content

Commit ddf13e3

Browse files
committed
Fix other missing configs and config errors
Signed-off-by: Nicolas Bigler <nicolas.bigler@vshn.ch>
1 parent 4905197 commit ddf13e3

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ helm repo add appuio https://charts.appuio.ch
1919
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/data-cube-curation-0.3.1/total)](https://github.com/appuio/charts/releases/tag/data-cube-curation-0.3.1) | [data-cube-curation](appuio/data-cube-curation/README.md) |
2020
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/exoip-1.0.4/total)](https://github.com/appuio/charts/releases/tag/exoip-1.0.4) | [exoip](appuio/exoip/README.md) |
2121
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/generic-0.1.2/total)](https://github.com/appuio/charts/releases/tag/generic-0.1.2) | [generic](appuio/generic/README.md) |
22-
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/haproxy-2.7.1/total)](https://github.com/appuio/charts/releases/tag/haproxy-2.7.1) | [haproxy](appuio/haproxy/README.md) |
22+
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/haproxy-2.7.2/total)](https://github.com/appuio/charts/releases/tag/haproxy-2.7.2) | [haproxy](appuio/haproxy/README.md) |
2323
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/mariadb-galera-1.2.6/total)](https://github.com/appuio/charts/releases/tag/mariadb-galera-1.2.6) | [mariadb-galera](appuio/mariadb-galera/README.md) |
2424
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/maxscale-2.0.1/total)](https://github.com/appuio/charts/releases/tag/maxscale-2.0.1) | [maxscale](appuio/maxscale/README.md) |
2525
| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/metrics-server-2.12.1/total)](https://github.com/appuio/charts/releases/tag/metrics-server-2.12.1) | [metrics-server](appuio/metrics-server/README.md) |

appuio/haproxy/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: 2.7.3
33
description: A Helm chart for HAProxy which can be customized by a config map.
44
name: haproxy
5-
version: 2.7.1
5+
version: 2.7.2
66
maintainers:
77
- name: APPUiO Team
88
email: info@appuio.ch

appuio/haproxy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# haproxy
22

3-
![Version: 2.7.1](https://img.shields.io/badge/Version-2.7.1-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square)
3+
![Version: 2.7.2](https://img.shields.io/badge/Version-2.7.2-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square)
44

55
A Helm chart for HAProxy which can be customized by a config map.
66

appuio/haproxy/templates/_helpers.tpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Create backendName depending on the selected configuration
3737
{{- define "haproxy.backendName" -}}
3838
{{- if eq .Values.haproxy.config "redisk8s" -}}
3939
redis-nodes
40-
{{- else if or (eq .Values.haproxy.config "galerak8s") (eq .Values.haproxy.config "galera") -}}
40+
{{- else if or (eq .Values.haproxy.config "galerak8s") (eq .Values.haproxy.config "galera") (eq .Values.haproxy.config "mariadb-operator") -}}
4141
galera-nodes
4242
{{- else -}}
4343
backend
@@ -178,10 +178,6 @@ frontend galeraMetrics
178178
{{- end }}
179179

180180
{{- $namespace := .Release.Namespace -}}
181-
backend galera-node-metrics
182-
mode http
183-
http-request set-path /metrics
184-
185181
{{ range $i, $e := .Values.haproxy.galera.nodes }}
186182
backend galera-node-metrics-{{$i}}
187183
mode http

appuio/haproxy/templates/metrics-backend-svc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if (or .Values.haproxy.redisk8s.metrics.enabled .Values.haproxy.galerak8s.metrics.enabled .Values.haproxy.galera.metrics.enabled) }}
1+
{{- if (or .Values.haproxy.redisk8s.metrics.enabled .Values.haproxy.galerak8s.metrics.enabled .Values.haproxy.galera.metrics.enabled .Values.haproxy.mariadbOperator.metrics.enabled) }}
22
apiVersion: v1
33
kind: Service
44
metadata:

0 commit comments

Comments
 (0)