From f0fe0eb64cd7ceec2e2a21636049e57bb3a096d1 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Wed, 20 Mar 2024 20:36:21 +0200 Subject: [PATCH] minio/charts: fix installations without logsearch (#2296) * minio/charts: fix installations without logsearch * fix ci-only case --- library/ix-dev/charts/minio/Chart.yaml | 2 +- .../charts/minio/ci/no-logsearch-values.yaml | 22 +++++++++++++++++++ .../ix-dev/charts/minio/templates/_minio.tpl | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 library/ix-dev/charts/minio/ci/no-logsearch-values.yaml diff --git a/library/ix-dev/charts/minio/Chart.yaml b/library/ix-dev/charts/minio/Chart.yaml index 984219fbb4f..7f74a99ae3c 100644 --- a/library/ix-dev/charts/minio/Chart.yaml +++ b/library/ix-dev/charts/minio/Chart.yaml @@ -3,7 +3,7 @@ description: High Performance, Kubernetes Native Object Storage annotations: title: MinIO type: application -version: 2.0.1 +version: 2.0.2 apiVersion: v2 appVersion: "2023-03-13" kubeVersion: ">=1.16.0-0" diff --git a/library/ix-dev/charts/minio/ci/no-logsearch-values.yaml b/library/ix-dev/charts/minio/ci/no-logsearch-values.yaml new file mode 100644 index 00000000000..df50db2acd3 --- /dev/null +++ b/library/ix-dev/charts/minio/ci/no-logsearch-values.yaml @@ -0,0 +1,22 @@ +minioConfig: + rootUser: super-admin + rootPassword: super-admin-password + +minioNetwork: + apiPort: 31000 + consolePort: 31001 + +minioStorage: + export: + type: pvc + logSearchApi: false + pgData: + type: emptyDir + emptyDirConfig: + medium: "" + size: "" + pgBackup: + type: emptyDir + emptyDirConfig: + medium: "" + size: "" diff --git a/library/ix-dev/charts/minio/templates/_minio.tpl b/library/ix-dev/charts/minio/templates/_minio.tpl index 3ed1143ace5..989d8075104 100644 --- a/library/ix-dev/charts/minio/templates/_minio.tpl +++ b/library/ix-dev/charts/minio/templates/_minio.tpl @@ -74,6 +74,7 @@ workload: "GID" 473 "mode" "check" "type" "init") | nindent 8 }} + {{- if .Values.minioStorage.logSearchApi }} wait-api: enabled: true type: init @@ -90,4 +91,5 @@ workload: sleep 2; done echo "API is up: {{ $logapi }}"; + {{- end }} {{- end -}}