From b9c6fd5ac84f2ac65b498cdd41eeb171005daaef Mon Sep 17 00:00:00 2001 From: verymahler Date: Thu, 24 Oct 2019 13:37:16 +0200 Subject: [PATCH] [stable/phpmyadmin] Add custom podLabels to deployment.yaml (#18228) * Add custom podLabels to deployment.yaml Signed-off-by: verymahler * Bump stable/phpmyadmin Chart version to 4.0.1 Signed-off-by: verymahler * Add podLabels value to README Signed-off-by: verymahler * Add podLabels to default values.yaml Signed-off-by: verymahler * Upgrade to MINOR version instead of PATCH Signed-off-by: verymahler --- stable/phpmyadmin/Chart.yaml | 2 +- stable/phpmyadmin/README.md | 1 + stable/phpmyadmin/templates/deployment.yaml | 3 +++ stable/phpmyadmin/values.yaml | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stable/phpmyadmin/Chart.yaml b/stable/phpmyadmin/Chart.yaml index 442515c5e6..b360993730 100644 --- a/stable/phpmyadmin/Chart.yaml +++ b/stable/phpmyadmin/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpmyadmin -version: 4.0.0 +version: 4.1.0 appVersion: 4.9.1 description: phpMyAdmin is an mysql administration frontend keywords: diff --git a/stable/phpmyadmin/README.md b/stable/phpmyadmin/README.md index d12f0a5846..e813e26a97 100644 --- a/stable/phpmyadmin/README.md +++ b/stable/phpmyadmin/README.md @@ -73,6 +73,7 @@ The following table lists the configurable parameters of the phpMyAdmin chart an | `nodeSelector` | Node labels for pod assignment | `{}` | | `tolerations` | List of node taints to tolerate | `[]` | | `affinity` | Map of node/pod affinities | `{}` | +| `podLabels` | Pod labels | `{}` | | `podAnnotations` | Pod annotations | `{}` | | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | Apache exporter image registry | `docker.io` | diff --git a/stable/phpmyadmin/templates/deployment.yaml b/stable/phpmyadmin/templates/deployment.yaml index 632c3cff28..b93e328529 100644 --- a/stable/phpmyadmin/templates/deployment.yaml +++ b/stable/phpmyadmin/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: app: {{ template "phpmyadmin.name" . }} chart: {{ template "phpmyadmin.chart" . }} release: {{ .Release.Name }} + {{- if .Values.podLabels }} +{{ toYaml .Values.podLabels | indent 8 }} + {{- end }} {{- if or .Values.podAnnotations .Values.metrics.enabled }} annotations: {{- if .Values.podAnnotations }} diff --git a/stable/phpmyadmin/values.yaml b/stable/phpmyadmin/values.yaml index dc5bb08463..331962ae99 100644 --- a/stable/phpmyadmin/values.yaml +++ b/stable/phpmyadmin/values.yaml @@ -118,6 +118,9 @@ tolerations: [] ## affinity: {} +## Pod labels +podLabels: {} + ## Pod annotations podAnnotations: {}