From 01cb35c8b16107a30cfe4dc281056a9dcb5381a4 Mon Sep 17 00:00:00 2001 From: golgoth31 Date: Thu, 23 Apr 2020 09:12:19 +0200 Subject: [PATCH] [bitnami/mongodb] allow arbiter to run on a different nodeSelector (#2370) * [bitnami/mongodb] add nodeselector option for Arbiter * [bitnami/mongodb] add entry to README * update after review * [bitnami/mongodb] use nindent for nodeSelectorArbiter * [bitnami/mongodb] bump chart version * [bitnami/mongodb] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/mongodb/Chart.yaml | 2 +- bitnami/mongodb/README.md | 1 + bitnami/mongodb/templates/statefulset-arbiter-rs.yaml | 5 ++--- bitnami/mongodb/values-production.yaml | 9 +++++---- bitnami/mongodb/values.yaml | 6 +++++- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/bitnami/mongodb/Chart.yaml b/bitnami/mongodb/Chart.yaml index d0cdf1f2fb..c5022d13f7 100644 --- a/bitnami/mongodb/Chart.yaml +++ b/bitnami/mongodb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mongodb -version: 7.11.1 +version: 7.12.0 appVersion: 4.2.6 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md index 2a0c9e97a9..866783354f 100644 --- a/bitnami/mongodb/README.md +++ b/bitnami/mongodb/README.md @@ -111,6 +111,7 @@ The following table lists the configurable parameters of the MongoDB chart and t | `priorityClassName` | Pod priority class name | `` | | `extraEnvVars` | Array containing extra env vars to be added to all pods in the cluster (evaluated as a template) | `nil` | | `nodeSelector` | Node labels for pod assignment | `{}` | +| `nodeSelectorArbiter` | Node labels for arbiter pod assignment; this will override "nodeSelector" field if defined (only for arbiter) | `{}` | | `affinity` | Affinity for pod assignment | `{}` | | `affinityArbiter` | Affinity for arbiter pod assignment | `{}` | | `tolerations` | Toleration labels for pod assignment | `{}` | diff --git a/bitnami/mongodb/templates/statefulset-arbiter-rs.yaml b/bitnami/mongodb/templates/statefulset-arbiter-rs.yaml index 723374d951..bcb9683528 100644 --- a/bitnami/mongodb/templates/statefulset-arbiter-rs.yaml +++ b/bitnami/mongodb/templates/statefulset-arbiter-rs.yaml @@ -59,9 +59,8 @@ spec: affinity: {{ toYaml .Values.affinityArbiter | indent 8 }} {{- end -}} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} + {{- if (or .Values.nodeSelector .Values.nodeSelectorArbiter) }} + nodeSelector: {{ toYaml (default .Values.nodeSelector .Values.nodeSelectorArbiter) | nindent 8 }} {{- end }} {{- if .Values.tolerations }} tolerations: diff --git a/bitnami/mongodb/values-production.yaml b/bitnami/mongodb/values-production.yaml index de60ca991a..1638b8f125 100644 --- a/bitnami/mongodb/values-production.yaml +++ b/bitnami/mongodb/values-production.yaml @@ -20,7 +20,7 @@ image: ## Bitnami MongoDB image tag ## ref: https://hub.docker.com/r/bitnami/mongodb/tags/ ## - tag: 4.2.6-debian-10-r8 + tag: 4.2.6-debian-10-r9 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -141,16 +141,13 @@ service: ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport ## # nodePort: - ## Specify the externalIP value ClusterIP service type. ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#external-ips # externalIPs: [] - ## Specify the loadBalancerIP value for LoadBalancer service types. ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer ## # loadBalancerIP: - ## Specify the loadBalancerSourceRanges value for LoadBalancer service types. ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## @@ -231,6 +228,10 @@ resourcesArbiter: {} ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector nodeSelector: {} +## Define Separate nodeSelector for arbiter +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector +nodeSelectorArbiter: {} + ## Affinity ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} diff --git a/bitnami/mongodb/values.yaml b/bitnami/mongodb/values.yaml index 26040a36d8..c1b70bc1bb 100644 --- a/bitnami/mongodb/values.yaml +++ b/bitnami/mongodb/values.yaml @@ -20,7 +20,7 @@ image: ## Bitnami MongoDB image tag ## ref: https://hub.docker.com/r/bitnami/mongodb/tags/ ## - tag: 4.2.6-debian-10-r8 + tag: 4.2.6-debian-10-r9 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -233,6 +233,10 @@ resourcesArbiter: {} ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector nodeSelector: {} +## Define Separate nodeSelector for arbiter +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector +nodeSelectorArbiter: {} + ## Affinity ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {}