From 59322032cb958df3d3121bb4a4d846cc9143ee88 Mon Sep 17 00:00:00 2001 From: Juan Ariza Toledano Date: Thu, 17 Dec 2020 11:02:12 +0100 Subject: [PATCH] [bitnami/mariadb-galera] Fix podLabels/podAnnotations (#4761) --- bitnami/mariadb-galera/Chart.yaml | 2 +- bitnami/mariadb-galera/README.md | 3 ++- bitnami/mariadb-galera/templates/statefulset.yaml | 3 +++ bitnami/mariadb-galera/values-production.yaml | 12 ++++++------ bitnami/mariadb-galera/values.yaml | 12 ++++++------ 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/bitnami/mariadb-galera/Chart.yaml b/bitnami/mariadb-galera/Chart.yaml index 384d474bc0..2654cf49b0 100644 --- a/bitnami/mariadb-galera/Chart.yaml +++ b/bitnami/mariadb-galera/Chart.yaml @@ -28,4 +28,4 @@ sources: - https://github.com/bitnami/bitnami-docker-mariadb-galera - https://github.com/prometheus/mysqld_exporter - https://mariadb.org -version: 5.3.2 +version: 5.3.3 diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index 9811119159..3dd91544c0 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -146,7 +146,8 @@ The following table lists the configurable parameters of the MariaDB Galera char | `persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | | `persistence.size` | Persistent Volume Size | `8Gi` | | `persistence.selector` | Selector to match an existing Persistent Volume (this value is evaluated as a template) | `{}` | -| `podLabels` | Additional pod labels | `{}` | +| `podLabels` | Extra labels for MariaDB Galera pods | `{}` (evaluated as a template) | +| `podAnnotations` | Annotations for MariaDB Galera pods | `{}` (evaluated as a template) | | `priorityClassName` | Priority Class Name for Statefulset | `` | | `extraInitContainers` | Additional init containers (this value is evaluated as a template) | `[]` | | `extraContainers` | Additional containers (this value is evaluated as a template) | `[]` | diff --git a/bitnami/mariadb-galera/templates/statefulset.yaml b/bitnami/mariadb-galera/templates/statefulset.yaml index fef9975580..905f62ec97 100644 --- a/bitnami/mariadb-galera/templates/statefulset.yaml +++ b/bitnami/mariadb-galera/templates/statefulset.yaml @@ -20,6 +20,9 @@ spec: annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }} {{- end }} labels: {{- include "common.labels.standard" . | nindent 8 }} + {{- if .Values.podLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }} + {{- end }} spec: {{- include "mariadb-galera.imagePullSecrets" . | nindent 6 }} {{- if .Values.schedulerName }} diff --git a/bitnami/mariadb-galera/values-production.yaml b/bitnami/mariadb-galera/values-production.yaml index b802fb81a6..33fed68fbb 100644 --- a/bitnami/mariadb-galera/values-production.yaml +++ b/bitnami/mariadb-galera/values-production.yaml @@ -403,7 +403,12 @@ replicaCount: 3 updateStrategy: type: RollingUpdate -## Additional pod annotations for MariaDB Galera pods +## Additional labels for MariaDB Galera pods +## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +## +podLabels: {} + +## Additional annotations for MariaDB Galera pods ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ ## podAnnotations: {} @@ -493,11 +498,6 @@ persistence: ## size: 8Gi -## Additional pod labels -## -# podLabels: -# extraLabel: extraValue - ## Priority Class Name # # priorityClassName: 'priorityClass' diff --git a/bitnami/mariadb-galera/values.yaml b/bitnami/mariadb-galera/values.yaml index 36da95de73..744e0660c4 100644 --- a/bitnami/mariadb-galera/values.yaml +++ b/bitnami/mariadb-galera/values.yaml @@ -402,7 +402,12 @@ replicaCount: 3 updateStrategy: type: RollingUpdate -## Additional pod annotations for MariaDB Galera pods +## Additional labels for MariaDB Galera pods +## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +## +podLabels: {} + +## Additional annotations for MariaDB Galera pods ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ ## podAnnotations: {} @@ -492,11 +497,6 @@ persistence: ## size: 8Gi -## Additional pod labels -## -# podLabels: -# extraLabel: extraValue - ## Priority Class Name # # priorityClassName: 'priorityClass'