From c522a3c203b3d2fc381698384c58e63ab2bba5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n=20Garc=C3=ADa?= Date: Tue, 17 Sep 2024 15:51:31 +0200 Subject: [PATCH] [bitnami/minio] fix: :bug: Add sleep to avoid race condition in provisioning (#29478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [bitnami/minio] fix: :bug: Add sleep to avoid race condition in provisioning Signed-off-by: Javier J. Salmerón García * Update CHANGELOG.md Signed-off-by: Bitnami Containers * fix: :bug: Change YAML string format Signed-off-by: Javier J. Salmerón García --------- Signed-off-by: Javier J. Salmerón García Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/minio/CHANGELOG.md | 13 ++++++++++--- bitnami/minio/Chart.yaml | 2 +- bitnami/minio/templates/provisioning-job.yaml | 14 +++++++++++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/bitnami/minio/CHANGELOG.md b/bitnami/minio/CHANGELOG.md index edc32d9c51..a0efb4cc93 100644 --- a/bitnami/minio/CHANGELOG.md +++ b/bitnami/minio/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 14.7.9 (2024-09-16) +## 14.7.10 (2024-09-17) -* [bitnami/minio] Release 14.7.9 ([#29455](https://github.com/bitnami/charts/pull/29455)) +* [bitnami/minio] fix: :bug: Add sleep to avoid race condition in provisioning ([#29478](https://github.com/bitnami/charts/pull/29478)) + +## 14.7.9 (2024-09-16) + +* [bitnami/minio] Release 14.7.9 (#29455) ([f0e7a10](https://github.com/bitnami/charts/commit/f0e7a10b383dac974d6704604e7cebbb355cccef)), closes [#29455](https://github.com/bitnami/charts/issues/29455) ## 14.7.8 (2024-09-11) @@ -38,9 +42,12 @@ ## 14.7.0 (2024-08-12) -* [bitnami/minio] Release 14.6.33 (#28731) ([558c1f8](https://github.com/bitnami/charts/commit/558c1f8056152e5d16fdf35db29c4028a31453fe)), closes [#28731](https://github.com/bitnami/charts/issues/28731) * [bitnami/minio]: Option to use a secret. (#27837) ([5c21623](https://github.com/bitnami/charts/commit/5c2162370dd5d99d4df91f36b1fcc778ac604673)), closes [#27837](https://github.com/bitnami/charts/issues/27837) +## 14.6.33 (2024-08-07) + +* [bitnami/minio] Release 14.6.33 (#28731) ([558c1f8](https://github.com/bitnami/charts/commit/558c1f8056152e5d16fdf35db29c4028a31453fe)), closes [#28731](https://github.com/bitnami/charts/issues/28731) + ## 14.6.32 (2024-08-03) * [bitnami/minio] Release 14.6.32 (#28650) ([eea4d67](https://github.com/bitnami/charts/commit/eea4d67577c35ec1a206109ec7e59fe565922fa8)), closes [#28650](https://github.com/bitnami/charts/issues/28650) diff --git a/bitnami/minio/Chart.yaml b/bitnami/minio/Chart.yaml index da81432d0b..771c056434 100644 --- a/bitnami/minio/Chart.yaml +++ b/bitnami/minio/Chart.yaml @@ -34,4 +34,4 @@ maintainers: name: minio sources: - https://github.com/bitnami/charts/tree/main/bitnami/minio -version: 14.7.9 +version: 14.7.10 diff --git a/bitnami/minio/templates/provisioning-job.yaml b/bitnami/minio/templates/provisioning-job.yaml index 719eadac39..cdc3fefc83 100644 --- a/bitnami/minio/templates/provisioning-job.yaml +++ b/bitnami/minio/templates/provisioning-job.yaml @@ -79,7 +79,7 @@ spec: command: - /bin/bash - -c - - >- + - |- set -e; echo "Start Minio provisioning"; @@ -143,6 +143,18 @@ spec: mc admin service restart {{ $minioAlias }} --wait --json; + # Adding a sleep to ensure that the check below does not cause + # a race condition. We check for the MinIO port because the + # "mc admin service restart --wait" command is not working as expected + sleep 5; + echo "Waiting for Minio to be available after restart"; + wait-for-port \ + --host={{ include "common.names.fullname" . }} \ + --state=inuse \ + --timeout=120 \ + {{ .Values.service.ports.api | int64 }}; + echo "Minio is available. Executing provisioning commands"; + {{- range $policy := .Values.provisioning.policies }} mc admin policy create {{ $minioAlias }} {{ $policy.name }} /etc/ilm/policy-{{ $policy.name }}.json; {{- end }}