From 443f8224186bb2d8bd04e5d6f73e4af1b954e50e Mon Sep 17 00:00:00 2001 From: Antoine Rehm Date: Mon, 24 Sep 2018 17:07:51 +0200 Subject: [PATCH] [stable/phpMyAdmin] Add nodeSelector, tolerations and affinity for phpMyAdmin (#7884) * Add nodeSelector, tolerations and affinity for phpMyAdmin Signed-off-by: Antoine Rehm * bump to 1.1.0 Signed-off-by: Antoine Rehm * Correct README.md chart version Signed-off-by: Antoine Rehm * Correct README.md Upgrading section Signed-off-by: Antoine Rehm --- stable/phpmyadmin/Chart.yaml | 2 +- stable/phpmyadmin/README.md | 3 +++ stable/phpmyadmin/templates/deployment.yaml | 12 ++++++++++++ stable/phpmyadmin/values.yaml | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/stable/phpmyadmin/Chart.yaml b/stable/phpmyadmin/Chart.yaml index b84be9a66e..6de63a3a63 100644 --- a/stable/phpmyadmin/Chart.yaml +++ b/stable/phpmyadmin/Chart.yaml @@ -1,5 +1,5 @@ name: phpmyadmin -version: 1.0.0 +version: 1.1.0 appVersion: 4.8.2 description: phpMyAdmin is an mysql administration frontend keywords: diff --git a/stable/phpmyadmin/README.md b/stable/phpmyadmin/README.md index 5e5e01d921..270fe3b529 100644 --- a/stable/phpmyadmin/README.md +++ b/stable/phpmyadmin/README.md @@ -60,6 +60,9 @@ The following table lists the configurable parameters of the phpMyAdmin chart an | `ingress.host` | ingress host | `nil` | | `ingress.tls` | tls for ingress | `[]` | | `resources` | CPU/Memory resource requests/limits | `{}` | +| `nodeSelector` | Node labels for pod assignment | `{}` | +| `tolerations` | List of node taints to tolerate | `[]` | +| `affinity` | Map of node/pod affinities | `{}` | For more information please refer to the [bitnami/phpmyadmin](http://github.com/bitnami/bitnami-docker-Phpmyadmin) image documentation. diff --git a/stable/phpmyadmin/templates/deployment.yaml b/stable/phpmyadmin/templates/deployment.yaml index 2bfe8c61bf..8fa52ad078 100644 --- a/stable/phpmyadmin/templates/deployment.yaml +++ b/stable/phpmyadmin/templates/deployment.yaml @@ -68,3 +68,15 @@ spec: {{- end }} resources: {{ toYaml .Values.resources | indent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/stable/phpmyadmin/values.yaml b/stable/phpmyadmin/values.yaml index 1c3946a330..ab29bdfe91 100644 --- a/stable/phpmyadmin/values.yaml +++ b/stable/phpmyadmin/values.yaml @@ -60,3 +60,18 @@ resources: {} # requests: # cpu: 100m # memory: 128Mi + +## Node labels for pod assignment +## Ref: https://kubernetes.io/docs/user-guide/node-selection/ +## +nodeSelector: {} + +## Tolerations for pod assignment +## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ +## +tolerations: [] + +## Affinity for pod assignment +## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity +## +affinity: {}