From 430c331dec46433d813b7c0fba4251fd167a41e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20de=20Paz=20Gal=C3=A1n?= Date: Thu, 14 Jan 2021 16:50:13 +0100 Subject: [PATCH] [bitnami/mongodb] Add serviceAccount annotations (#4968) * [bitnami/mongodb] Add serviceAccount annotations Signed-off-by: fdepaz * Bump minor version --- bitnami/mongodb/Chart.yaml | 2 +- bitnami/mongodb/README.md | 11 ++++++----- bitnami/mongodb/templates/serviceaccount.yaml | 3 +++ bitnami/mongodb/values-production.yaml | 3 +++ bitnami/mongodb/values.yaml | 3 +++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/bitnami/mongodb/Chart.yaml b/bitnami/mongodb/Chart.yaml index 8125af57a..ab8a8bf19 100644 --- a/bitnami/mongodb/Chart.yaml +++ b/bitnami/mongodb/Chart.yaml @@ -26,4 +26,4 @@ name: mongodb sources: - https://github.com/bitnami/bitnami-docker-mongodb - https://mongodb.org -version: 10.3.7 +version: 10.4.0 diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md index f6b2af375..9b50adf84 100644 --- a/bitnami/mongodb/README.md +++ b/bitnami/mongodb/README.md @@ -171,8 +171,8 @@ The following tables lists the configurable parameters of the MongoDB chart and | `extraEnvVarsSecret` | Name of existing Secret containing extra env vars (in case of sensitive data) | `nil` | | `tls.enabled` | Enable MongoDB TLS support between nodes in the cluster as well as between mongo clients and nodes | `false` | | `tls.existingSecret` | Existing secret with TLS certificates (keys: `mongodb-ca-cert`, `mongodb-ca-key`, `client-pem`) | `nil` | -| `tls.caCert` | Custom CA certificated (base64 encoded) | `nil` | -| `tls.caKey` | CA certificate private key (base64 encoded) | `nil` | +| `tls.caCert` | Custom CA certificated (base64 encoded) | `nil` | +| `tls.caKey` | CA certificate private key (base64 encoded) | `nil` | | `tls.image.registry` | Init container TLS certs setup image registry (nginx) | `docker.io` | | `tls.image.repository` | Init container TLS certs setup image name (nginx) | `bitnami/nginx` | | `tls.image.tag` | Init container TLS certs setup image tag (nginx) | `{TAG_NAME}` | @@ -245,14 +245,14 @@ The following tables lists the configurable parameters of the MongoDB chart and ### Persistence parameters -| Parameter | Description | Default | -|-------------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------| +| Parameter | Description | Default | +|---------------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------| | `persistence.enabled` | Enable MongoDB data persistence using PVC | `true` | | `persistence.existingClaim` | Provide an existing `PersistentVolumeClaim` (only when `architecture=standalone`) | `nil` (evaluated as a template) | | `persistence.storageClass` | PVC Storage Class for MongoDB data volume | `nil` | | `persistence.accessMode` | PVC Access Mode for MongoDB data volume | `ReadWriteOnce` | | `persistence.size` | PVC Storage Request for MongoDB data volume | `8Gi` | -| `persistence.mountPath` | Path to mount the volume at | `/bitnami/mongodb` | +| `persistence.mountPath` | Path to mount the volume at | `/bitnami/mongodb` | | `persistence.subPath` | Subdirectory of the volume to mount at | `""` | | `persistence.volumeClaimTemplates.selector` | A label query over volumes to consider for binding (e.g. when using local volumes) | `` | @@ -262,6 +262,7 @@ The following tables lists the configurable parameters of the MongoDB chart and |-------------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------| | `serviceAccount.create` | Enable creation of ServiceAccount for MongoDB pods | `true` | | `serviceAccount.name` | Name of the created serviceAccount | Generated using the `mongodb.fullname` template | +| `serviceAccount.annotations` | Additional Service Account annotations | `{}` | | `rbac.create` | Weather to create & use RBAC resources or not | `false` | ### Volume Permissions parameters diff --git a/bitnami/mongodb/templates/serviceaccount.yaml b/bitnami/mongodb/templates/serviceaccount.yaml index bac0a862a..9f898df7b 100644 --- a/bitnami/mongodb/templates/serviceaccount.yaml +++ b/bitnami/mongodb/templates/serviceaccount.yaml @@ -5,6 +5,9 @@ metadata: name: {{ include "mongodb.serviceAccountName" . }} namespace: {{ include "mongodb.namespace" . }} labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.serviceAccount.annotations }} + annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }} + {{- end }} secrets: - name: {{ template "mongodb.fullname" . }} {{- end }} diff --git a/bitnami/mongodb/values-production.yaml b/bitnami/mongodb/values-production.yaml index b844c51cf..d57d60018 100644 --- a/bitnami/mongodb/values-production.yaml +++ b/bitnami/mongodb/values-production.yaml @@ -830,6 +830,9 @@ serviceAccount: ## If not set and create is true, a name is generated using the rabbitmq.fullname template ## # name: + ## Annotations for the Service Account + ## + annotations: {} ## Role Based Access ## ref: https://kubernetes.io/docs/admin/authorization/rbac/ diff --git a/bitnami/mongodb/values.yaml b/bitnami/mongodb/values.yaml index aedd9a835..2f5436611 100644 --- a/bitnami/mongodb/values.yaml +++ b/bitnami/mongodb/values.yaml @@ -830,6 +830,9 @@ serviceAccount: ## If not set and create is true, a name is generated using the rabbitmq.fullname template ## # name: + ## Annotations for the Service Account + ## + annotations: {} ## Role Based Access ## ref: https://kubernetes.io/docs/admin/authorization/rbac/