[mariadb-galera] labels standardized for all components

common/mariadb-galera/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v0.29.5 - 2024/07/30
+* labels standardized for all components
+ * `sharedservices.labels` renamed to `mariadb-galera.labels` to avoid [conflicts with templates from other charts](https://helm.sh/docs/chart_template_guide/subcharts_and_globals/#sharing-templates-with-subcharts)
+ * redundant labels removed
+ * label selectors updated
+ * unit tests added/updated
+* software versions bumped
+ * Ubuntu packages timestamp `20240724035543`
+* chart version bumped
+
 ## v0.29.4 - 2024/07/23
 * init containers to set `vm.max_map_count` and `vm.drop_caches` removed
  * because both settings are not required for the related components

common/mariadb-galera/helm/Chart.yaml

@@ -3,7 +3,7 @@ name: mariadb-galera
 description: Docker images and Helm chart to deploy a [MariaDB](https://mariadb.com/kb/en/getting-installing-and-upgrading-mariadb/) HA cluster based on [Galera](https://mariadb.com/kb/en/what-is-mariadb-galera-cluster/)
 home: "https://github.com/sapcc/helm-charts/tree/master/common/mariadb-galera"
 appVersion: 10.5.25
-version: 0.29.4
+version: 0.29.5
 type: application
 kubeVersion: ">=1.18"
 maintainers:

common/mariadb-galera/helm/README.md.gotmpl

@@ -72,11 +72,11 @@ The [changelog](CHANGELOG.md) contains information about changes in certain vers
 
 * productive version
  ```bash
- docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240618114008 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240618114008 ./docker/mariadb-galera/
+ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240724035543 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240724035543 ./docker/mariadb-galera/
  ```
 * debug version
  ```bash
- docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240618114008 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 --build-arg GALERA_DEBUG=true -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-debug:10.5.25-20240618114008 ./docker/mariadb-galera/
+ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240724035543 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 --build-arg GALERA_DEBUG=true -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-debug:10.5.25-20240724035543 ./docker/mariadb-galera/
  ```
 
 ### MySQL Exporter image
@@ -85,7 +85,7 @@ The [changelog](CHANGELOG.md) contains information about changes in certain vers
 | USERID | id of the user that should run the binary |
 
 ```bash
-docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mysqld_exporter --build-arg SOFT_VERSION=0.14.0 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3000 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240618114008 ./docker/mysqld_exporter/
+docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mysqld_exporter --build-arg SOFT_VERSION=0.14.0 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3000 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240724035543 ./docker/mysqld_exporter/
 ```
 
 ### ProxySQL image
@@ -94,7 +94,7 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE
 | USERID | id of the user that should run the binary |
 
 ```bash
-docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=proxysql --build-arg SOFT_VERSION=2.6.3 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3100 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240618114008 ./docker/proxysql/
+docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=proxysql --build-arg SOFT_VERSION=2.6.3 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3100 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240724035543 ./docker/proxysql/
 ```
 
 ### HAProxy image
@@ -104,7 +104,7 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE
 | USERID | id of the user that should run the binary |
 
 ```bash
-docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=haproxy --build-arg SOFT_VERSION=2.8.10 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3100 --build-arg MARIADB_VERSION=10.5.23+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-haproxy:2.8.10-20240618114008 ./docker/haproxy/
+docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=haproxy --build-arg SOFT_VERSION=2.8.10 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3100 --build-arg MARIADB_VERSION=10.5.23+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-haproxy:2.8.10-20240724035543 ./docker/haproxy/
 ```
 
 ### Kopia image
@@ -114,14 +114,14 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE
 | USERID | id of the user that should run the binary |
 
 ```bash
-docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=kopia --build-arg SOFT_VERSION=0.17.0 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3200 --build-arg MARIADB_VERSION=10.5.20+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopiabackup:0.17.0-20240618114008 ./docker/kopia/
+docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=kopia --build-arg SOFT_VERSION=0.17.0 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3200 --build-arg MARIADB_VERSION=10.5.20+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopiabackup:0.17.0-20240724035543 ./docker/kopia/
 ```
 
 ### Ubuntu image
 
 ```bash
-docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg IMG_VERSION=20240618114008 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:20.04-20240618114008 ./docker/ubuntu/
-docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg IMG_VERSION=20240618114008 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 ./docker/ubuntu/
+docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg IMG_VERSION=20240724035543 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:20.04-20240724035543 ./docker/ubuntu/
+docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg IMG_VERSION=20240724035543 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 ./docker/ubuntu/
 ```
 
 ## Helm chart

common/mariadb-galera/helm/templates/_helpers.tpl

@@ -45,8 +45,15 @@ metadata:
  loadbalancer.openstack.org/enable-health-monitor: "false"
  {{- end }}
  labels:
- app: {{ .global.Release.Name }}
- {{- include "sharedservices.labels" .global | indent 4 }}
+ {{- if or (eq .component "database") (eq .component "database-direct") }}
+ {{- include "mariadb-galera.labels" (list .global "version" "database" "svc" "database") | indent 4 }}
+ {{- else if eq .component "kopiaserver"}}
+ {{- include "mariadb-galera.labels" (list .global "version" "kopiabackup" "svc" "server") | indent 4 }}
+ {{- else if eq .component "proxysql"}}
+ {{- include "mariadb-galera.labels" (list .global "version" "proxysql" "svc" "proxy") | indent 4 }}
+ {{- else if eq .component "haproxy"}}
+ {{- include "mariadb-galera.labels" (list .global "version" "haproxy" "svc" "proxy") | indent 4 }}
+ {{- end }}
 spec:
  {{- if and (.service.headless) (ne .service.type "LoadBalancer") (eq .replica "notused") }}
  type: {{ required "the network service type has to be defined" .service.type }}
@@ -64,17 +71,21 @@ spec:
  {{- if ne .replica "notused" }}
  statefulset.kubernetes.io/pod-name: {{ (printf "%s-%s" $nodeNamePrefix .replica) }}
  {{- else if and (hasKey .global.Values.mariadb "autostart") (not .global.Values.mariadb.autostart) }}
- component: "disabledBecauseOf-mariadb.autostart-disabled"
+ app.kubernetes.io/component: "disabledBecauseOf-mariadb.autostart-disabled"
  {{- else if and (.global.Values.command) (hasKey .global.Values.command "database") }}
- component: "disabledBecauseOf-command.database-defined"
+ app.kubernetes.io/component: "disabledBecauseOf-command.database-defined"
  {{- else if and (hasKey .global.Values.mariadb "wipeDataAndLog") (.global.Values.mariadb.wipeDataAndLog) }}
- component: "disabledBecauseOf-mariadb.wipeDataAndLog-enabled"
+ app.kubernetes.io/component: "disabledBecauseOf-mariadb.wipeDataAndLog-enabled"
  {{- else if and (hasKey .global.Values.mariadb.galera.restore "kopia") (.global.Values.mariadb.galera.restore.kopia.enabled) }}
- component: "disabledBecauseOf-mariadb.galera.restore-enabled"
- {{- else if eq .component "database-direct" }}
- component: "database"
- {{- else }}
- component: {{ .component | quote }}
+ app.kubernetes.io/component: "disabledBecauseOf-mariadb.galera.restore-enabled"
+ {{- else if or (eq .component "database") (eq .component "database-direct") }}
+ app.kubernetes.io/component: {{ (index .global.Values.image (printf "%s" "database")).softwarename }}-sts-database
+ {{- else if eq .component "kopiaserver" }}
+ app.kubernetes.io/component: {{ (index .global.Values.image (printf "%s" "kopiabackup")).softwarename }}-deploy-server
+ {{- else if eq .component "proxysql"}}
+ app.kubernetes.io/component: {{ (index .global.Values.image (printf "%s" "proxysql")).softwarename }}-sts-proxy
+ {{- else if eq .component "haproxy"}}
+ app.kubernetes.io/component: {{ (index .global.Values.image (printf "%s" "haproxy")).softwarename }}-deploy-proxy
  {{- end }}
  ports:
  {{- range $portKey, $portValue := .service.ports }}
@@ -247,7 +258,7 @@ spec:
 
 {{/*
  Generate Kubernetes basic-auth secrets
- include "generateSecretTypeOpaque" (dict "global" .global "name" $.name "credential" $.credential "suffix" $.suffix)
+ include "generateSecretTypeBasicAuth" (dict "global" .global "name" $.name "credential" $.credential "suffix" $.suffix)
 */}}
 {{- define "generateSecretTypeBasicAuth" }}
 ---
@@ -258,7 +269,7 @@ metadata:
  namespace: {{ $.global.Release.Namespace }}
  name: {{ include "commonPrefix" .global }}-{{ $.suffix }}-{{ $.name }}
  labels:
- {{- include "sharedservices.labels" .global | indent 4 }}
+ {{- include "mariadb-galera.labels" (list .global "version" "database" "secret" "basic") | indent 4 }}
 data:
  username: {{ (required (printf "%s.users.%s.username is required to configure the Kubernetes secret for the '%s' user" $.suffix $.name $.name) $.credential.username) | b64enc }}
  password: {{ (required (printf "%s.users.%s.password is required to configure the Kubernetes secret for the '%s' user" $.suffix $.name $.name) $.credential.password) | b64enc }}
@@ -276,6 +287,8 @@ type: Opaque
 metadata:
  namespace: {{ $.global.Release.Namespace }}
  name: {{ include "commonPrefix" .global }}-{{ $.suffix }}-{{ $.name }}
+ labels:
+ {{- include "mariadb-galera.labels" (list .global "version" "database" "secret" "opaque") | indent 4 }}
 data:
  password: {{ (required (printf "%s.users.%s.password is required to configure the Kubernetes secret for the '%s' user" $.suffix $.name $.name) $.credential.password) | b64enc }}
 {{- end }}
@@ -292,6 +305,8 @@ type: kubernetes.io/dockerconfigjson
 metadata:
  namespace: {{ $.global.Release.Namespace }}
  name: {{ include "commonPrefix" .global }}-pullsecret-{{ $.name }}
+ labels:
+ {{- include "mariadb-galera.labels" (list .global "version" "database" "secret" "dockerconfigjson") | indent 4 }}
 data:
  .dockerconfigjson: {{ printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" (required (printf "image.pullSecrets.%s.registry is required to configure the Kubernetes pull secret '%s'" $.name $.name) $.credential.registry) (printf "%s" (required (printf "image.pullSecrets.%s.credential is required to configure the Kubernetes pull secret '%s'" $.name $.name) $.credential.credential) | b64enc) | b64enc }}
 {{- end }}
@@ -308,12 +323,29 @@ data:
  {{- end }}
 {{- end }}
 
-{{- define "sharedservices.labels" }}
+{{/*
+ Generate labels
+ $ = global values
+ version/noversion = enable/disable version fields in labels
+ database = desired component name
+ job = object type
+ config = provided function
+ include "mariadb-galera.labels" (list $ "version" "database" "sts" "database")
+ include "mariadb-galera.labels" (list $ "version" "database" "job" "config")
+*/}}
+{{- define "mariadb-galera.labels" }}
+{{- $ := index . 0 }}
+{{- $component := index . 2 }}
+{{- $type := index . 3 }}
+{{- $function := index . 4 }}
 app.kubernetes.io/name: {{ $.Chart.Name }}
 app.kubernetes.io/instance: {{ $.Chart.Name }}-{{ $.Release.Name }}
-app.kubernetes.io/version: {{ $.Chart.Version }}
-app.kubernetes.io/component: MariaDB-Galera
+app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" $component)).softwarename }}-{{ $type }}-{{ $function }}
 app.kubernetes.io/part-of: {{ $.Release.Name }}
+ {{- if eq (index . 1) "version" }}
+app.kubernetes.io/version: {{ (index $.Values.image (printf "%s" $component)).softwareversion }}-{{ (index $.Values.image (printf "%s" $component)).imageversion | int }}
+helm.sh/chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
+ {{- end }}
 {{- end }}
 
 {{- define "storageclassCinder" }}
@@ -323,7 +355,7 @@ kind: StorageClass
 metadata:
  name: {{ include "commonPrefix" $ }}-cinder
  labels:
- {{- include "sharedservices.labels" $ | indent 4 }}
+ {{- include "mariadb-galera.labels" (list $ "version" "database" "sc" "block") | indent 4 }}
 parameters:
  type: vmware
 provisioner: cinder.csi.openstack.org
@@ -339,7 +371,7 @@ kind: StorageClass
 metadata:
  name: {{ include "commonPrefix" $ }}-nfs
  labels:
- {{- include "sharedservices.labels" $ | indent 4 }}
+ {{- include "mariadb-galera.labels" (list $ "version" "database" "sc" "file") | indent 4 }}
 parameters:
  pathPattern: "${.PVC.namespace}-${.PVC.name}"
  onDelete: "delete"

common/mariadb-galera/helm/templates/alerts.yaml

@@ -12,13 +12,8 @@ metadata:
  name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "database")) }}-alerts
  namespace: {{ $.Release.Namespace }}
  labels:
- app: {{ $.Release.Name }}
- component: "database"
- release: {{ $.Release.Name }}
- chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
- heritage: "{{ $.Release.Service }}"
  prometheus: {{ $.Values.monitoring.prometheus.instance.database | default "prometheus" | quote }}
- {{- include "sharedservices.labels" $ | indent 4 }}
+ {{- include "mariadb-galera.labels" (list $ "noversion" "database" "crd" "promrule") | indent 4 }}
 spec:
  groups:
 {{ include (print .Template.BasePath "/alerts/_mariadb.tpl") . | indent 2 }}
@@ -35,13 +30,8 @@ metadata:
  name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "proxysql")) }}-alerts
  namespace: {{ $.Release.Namespace }}
  labels:
- app: {{ $.Release.Name }}
- component: "proxysql"
- release: {{ $.Release.Name }}
- chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
- heritage: "{{ $.Release.Service }}"
  prometheus: {{ $.Values.monitoring.prometheus.instance.database | default "prometheus" | quote }}
- {{- include "sharedservices.labels" $ | indent 4 }}
+ {{- include "mariadb-galera.labels" (list $ "noversion" "proxysql" "crd" "promrule") | indent 4 }}
 spec:
  groups:
 {{ include (print .Template.BasePath "/alerts/_proxysql.tpl") . | indent 2 }}
@@ -58,13 +48,8 @@ metadata:
  name: {{ include "commonPrefix" $ }}-backup-kopiaserver-alerts
  namespace: {{ $.Release.Namespace }}
  labels:
- app: {{ $.Release.Name }}
- component: "kopiaserver"
- release: {{ $.Release.Name }}
- chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
- heritage: "{{ $.Release.Service }}"
  prometheus: {{ $.Values.monitoring.prometheus.instance.database | default "prometheus" | quote }}
- {{- include "sharedservices.labels" $ | indent 4 }}
+ {{- include "mariadb-galera.labels" (list $ "version" "kopiabackup" "crd" "promrule") | indent 4 }}
 spec:
  groups:
 {{ include (print .Template.BasePath "/alerts/_kopia.tpl") . | indent 2 }}
@@ -81,13 +66,8 @@ metadata:
  name: {{ include "commonPrefix" $ }}-kubernetes-alerts
  namespace: {{ $.Release.Namespace }}
  labels:
- app: {{ $.Release.Name }}
- component: "kubernetes"
- release: {{ $.Release.Name }}
- chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
- heritage: "{{ $.Release.Service }}"
  prometheus: {{ $.Values.monitoring.prometheus.instance.kubernetes | default "prometheus" | quote }}
- {{- include "sharedservices.labels" $ | indent 4 }}
+ {{- include "mariadb-galera.labels" (list $ "version" "database" "crd" "promrule") | indent 4 }}
 spec:
  groups:
 {{ include (print .Template.BasePath "/alerts/_kubernetes.tpl") . | indent 2 }}

common/mariadb-galera/helm/templates/configmap-haproxy.yaml

@@ -6,8 +6,7 @@ metadata:
  namespace: {{ $.Release.Namespace }}
  name: {{ include "commonPrefix" $ }}-haproxy-config
  labels:
- app: {{ $.Release.Name }}
- {{- include "sharedservices.labels" $ | indent 4 }}
+ {{- include "mariadb-galera.labels" (list $ "noversion" "haproxy" "cm" "config") | indent 4 }}
 data:
 {{ tpl (.Files.Glob "scripts/haproxy/haproxy.cfg").AsConfig . | indent 2 }}
 ---
@@ -17,8 +16,7 @@ metadata:
  namespace: {{ $.Release.Namespace }}
  name: {{ include "commonPrefix" $ }}-haproxy-probes-sh
  labels:
- app: {{ $.Release.Name }}
- {{- include "sharedservices.labels" $ | indent 4 }}
+ {{- include "mariadb-galera.labels" (list $ "noversion" "haproxy" "cm" "probes") | indent 4 }}
 data:
 {{ tpl (.Files.Glob "scripts/haproxy/startup.sh").AsConfig . | indent 2 }}
 {{ tpl (.Files.Glob "scripts/haproxy/liveness.sh").AsConfig . | indent 2 }}