From c12cd9a2c710dd3e41b9dae0fc2510016ef37e4e Mon Sep 17 00:00:00 2001 From: awuetz Date: Wed, 17 Mar 2021 14:17:24 +0100 Subject: [PATCH] [bitnami/minio] Extracted mountPath to be flexible and set the default value (#5787) * Extracted mountPath to be flexible and set the default to the default bitnami minio image config * Extracted mountPath to be flexible and set the default to the default bitnami minio image config * Update bitnami/minio/templates/distributed/statefulset.yaml Co-authored-by: Miguel Ruiz * Update bitnami/minio/values.yaml Co-authored-by: Miguel Ruiz * Bumped to new version * Updated readme and introduced env var for MINIO_CERTSDIR * [bitnami/minio] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Miguel Ruiz Co-authored-by: Bitnami Containers --- bitnami/minio/Chart.yaml | 4 ++-- bitnami/minio/README.md | 1 + bitnami/minio/templates/distributed/statefulset.yaml | 6 +++++- bitnami/minio/values.yaml | 7 +++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/bitnami/minio/Chart.yaml b/bitnami/minio/Chart.yaml index 6a88c3071..3ad3b9714 100644 --- a/bitnami/minio/Chart.yaml +++ b/bitnami/minio/Chart.yaml @@ -1,7 +1,7 @@ annotations: category: Infrastructure apiVersion: v2 -appVersion: 2021.3.4 +appVersion: 2021.3.17 dependencies: - name: common repository: https://charts.bitnami.com/bitnami @@ -25,4 +25,4 @@ name: minio sources: - https://github.com/bitnami/bitnami-docker-minio - https://min.io -version: 6.4.1 +version: 6.5.0 diff --git a/bitnami/minio/README.md b/bitnami/minio/README.md index c5fd9d62b..ce1f69f97 100644 --- a/bitnami/minio/README.md +++ b/bitnami/minio/README.md @@ -95,6 +95,7 @@ The following table lists the configurable parameters of the MinIO® chart an | `forceNewKeys` | Force admin credentials (access and secret key) to be reconfigured every time they change in the secrets | `false` | | `tls.enabled` | Enable tls in front of the container | `true` | | `tls.secretName` | The name of the secret containing the certificates and key. | `nil` | +| `tls.mountPath` | The mount path where the secret will be located. | `nil` | | `defaultBuckets` | Comma, semi-colon or space separated list of buckets to create (only in standalone mode) | `nil` | | `disableWebUI` | Disable MinIO® Web UI | `false` | | `command` | Default container command (useful when using custom images) | `{}` | diff --git a/bitnami/minio/templates/distributed/statefulset.yaml b/bitnami/minio/templates/distributed/statefulset.yaml index 8d851b0bf..407b9e31f 100644 --- a/bitnami/minio/templates/distributed/statefulset.yaml +++ b/bitnami/minio/templates/distributed/statefulset.yaml @@ -170,6 +170,10 @@ spec: value: {{ ternary "off" "on" .Values.disableWebUI | quote }} - name: MINIO_PROMETHEUS_AUTH_TYPE value: {{ .Values.metrics.prometheusAuthType | quote }} + {{- if .Values.tls.mountPath }} + - name: MINIO_CERTSDIR + value: {{ .Values.tls.mountPath | quote }} + {{- end }} {{- if .Values.extraEnv }} {{- include "common.tplvalues.render" (dict "value" .Values.extraEnv "context" $) | nindent 12 }} {{- end }} @@ -233,7 +237,7 @@ spec: {{- end }} {{- if .Values.tls.enabled }} - name: minio-certs - mountPath: /opt/bitnami/minio/certs/ + mountPath: {{ default "/certs" .Values.tls.mountPath }} {{- end }} {{- if and .Values.persistence.enabled (gt $drivesPerNode 1) }} {{- range $diskId := until $drivesPerNode }} diff --git a/bitnami/minio/values.yaml b/bitnami/minio/values.yaml index 79b3bb345..be6d41346 100644 --- a/bitnami/minio/values.yaml +++ b/bitnami/minio/values.yaml @@ -26,7 +26,7 @@ global: image: registry: docker.io repository: bitnami/minio - tag: 2021.3.4-debian-10-r9 + tag: 2021.3.17-debian-10-r0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -50,7 +50,7 @@ image: clientImage: registry: docker.io repository: bitnami/minio-client - tag: 2021.3.10-debian-10-r1 + tag: 2021.3.12-debian-10-r6 ## String to partially override common.names.fullname template (will maintain the release name) ## @@ -136,6 +136,9 @@ tls: ## Name of an existing secret holding the certificate information ## secretName: "" + ## The mounted path where the secret will be located + ## Custom mount path where the certificates will be located, if empty will default to /certs + mountPath: "" ## An array to add extra env vars ## e.g: