From ab4bc4e048e5405b81622216ac6cb1961b105129 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Thu, 27 Jul 2023 18:00:34 +0000 Subject: [PATCH] Publish new changes in catalog --- .../minio/{1.0.19 => 1.0.20}/Chart.lock | 0 .../minio/{1.0.19 => 1.0.20}/Chart.yaml | 2 +- enterprise/minio/{1.0.19 => 1.0.20}/README.md | 0 .../minio/{1.0.19 => 1.0.20}/app-readme.md | 0 .../charts/common-1.0.12.tgz | Bin .../ci/snmd-https-values.yaml | 0 .../ci/snmd-logsearch-https-values.yaml | 0 .../ci/snmd-logsearch-values.yaml | 0 .../{1.0.19 => 1.0.20}/ci/snmd-values.yaml | 0 .../ci/snsd-https-values.yaml | 0 .../ci/snsd-logsearch-https-values.yaml | 0 .../ci/snsd-logsearch-values.yaml | 0 .../{1.0.19 => 1.0.20}/ci/snsd-values.yaml | 0 .../minio/{1.0.19 => 1.0.20}/ix_values.yaml | 0 .../minio/{1.0.19 => 1.0.20}/metadata.yaml | 0 .../{1.0.19 => 1.0.20}/migrations/migrate | 0 .../minio/{1.0.19 => 1.0.20}/questions.yaml | 2 +- .../{1.0.19 => 1.0.20}/templates/NOTES.txt | 0 .../templates/_configuration.tpl | 0 .../{1.0.19 => 1.0.20}/templates/_helpers.tpl | 21 +++++++++++++++++- .../templates/_logsearch.tpl | 0 .../{1.0.19 => 1.0.20}/templates/_minio.tpl | 0 .../{1.0.19 => 1.0.20}/templates/_portal.tpl | 0 .../templates/_postgres.tpl | 0 .../{1.0.19 => 1.0.20}/templates/common.yaml | 0 .../upgrade_strategy_disable | 0 26 files changed, 22 insertions(+), 3 deletions(-) rename enterprise/minio/{1.0.19 => 1.0.20}/Chart.lock (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/Chart.yaml (97%) rename enterprise/minio/{1.0.19 => 1.0.20}/README.md (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/app-readme.md (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/charts/common-1.0.12.tgz (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ci/snmd-https-values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ci/snmd-logsearch-https-values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ci/snmd-logsearch-values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ci/snmd-values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ci/snsd-https-values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ci/snsd-logsearch-https-values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ci/snsd-logsearch-values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ci/snsd-values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/ix_values.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/metadata.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/migrations/migrate (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/questions.yaml (99%) rename enterprise/minio/{1.0.19 => 1.0.20}/templates/NOTES.txt (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/templates/_configuration.tpl (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/templates/_helpers.tpl (81%) rename enterprise/minio/{1.0.19 => 1.0.20}/templates/_logsearch.tpl (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/templates/_minio.tpl (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/templates/_portal.tpl (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/templates/_postgres.tpl (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/templates/common.yaml (100%) rename enterprise/minio/{1.0.19 => 1.0.20}/upgrade_strategy_disable (100%) diff --git a/enterprise/minio/1.0.19/Chart.lock b/enterprise/minio/1.0.20/Chart.lock similarity index 100% rename from enterprise/minio/1.0.19/Chart.lock rename to enterprise/minio/1.0.20/Chart.lock diff --git a/enterprise/minio/1.0.19/Chart.yaml b/enterprise/minio/1.0.20/Chart.yaml similarity index 97% rename from enterprise/minio/1.0.19/Chart.yaml rename to enterprise/minio/1.0.20/Chart.yaml index 6b0ac564cb..9ab3da0fb3 100644 --- a/enterprise/minio/1.0.19/Chart.yaml +++ b/enterprise/minio/1.0.20/Chart.yaml @@ -3,7 +3,7 @@ description: High Performance, Kubernetes Native Object Storage annotations: title: MinIO type: application -version: 1.0.19 +version: 1.0.20 apiVersion: v2 appVersion: '2023-03-24' kubeVersion: '>=1.16.0-0' diff --git a/enterprise/minio/1.0.19/README.md b/enterprise/minio/1.0.20/README.md similarity index 100% rename from enterprise/minio/1.0.19/README.md rename to enterprise/minio/1.0.20/README.md diff --git a/enterprise/minio/1.0.19/app-readme.md b/enterprise/minio/1.0.20/app-readme.md similarity index 100% rename from enterprise/minio/1.0.19/app-readme.md rename to enterprise/minio/1.0.20/app-readme.md diff --git a/enterprise/minio/1.0.19/charts/common-1.0.12.tgz b/enterprise/minio/1.0.20/charts/common-1.0.12.tgz similarity index 100% rename from enterprise/minio/1.0.19/charts/common-1.0.12.tgz rename to enterprise/minio/1.0.20/charts/common-1.0.12.tgz diff --git a/enterprise/minio/1.0.19/ci/snmd-https-values.yaml b/enterprise/minio/1.0.20/ci/snmd-https-values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ci/snmd-https-values.yaml rename to enterprise/minio/1.0.20/ci/snmd-https-values.yaml diff --git a/enterprise/minio/1.0.19/ci/snmd-logsearch-https-values.yaml b/enterprise/minio/1.0.20/ci/snmd-logsearch-https-values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ci/snmd-logsearch-https-values.yaml rename to enterprise/minio/1.0.20/ci/snmd-logsearch-https-values.yaml diff --git a/enterprise/minio/1.0.19/ci/snmd-logsearch-values.yaml b/enterprise/minio/1.0.20/ci/snmd-logsearch-values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ci/snmd-logsearch-values.yaml rename to enterprise/minio/1.0.20/ci/snmd-logsearch-values.yaml diff --git a/enterprise/minio/1.0.19/ci/snmd-values.yaml b/enterprise/minio/1.0.20/ci/snmd-values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ci/snmd-values.yaml rename to enterprise/minio/1.0.20/ci/snmd-values.yaml diff --git a/enterprise/minio/1.0.19/ci/snsd-https-values.yaml b/enterprise/minio/1.0.20/ci/snsd-https-values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ci/snsd-https-values.yaml rename to enterprise/minio/1.0.20/ci/snsd-https-values.yaml diff --git a/enterprise/minio/1.0.19/ci/snsd-logsearch-https-values.yaml b/enterprise/minio/1.0.20/ci/snsd-logsearch-https-values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ci/snsd-logsearch-https-values.yaml rename to enterprise/minio/1.0.20/ci/snsd-logsearch-https-values.yaml diff --git a/enterprise/minio/1.0.19/ci/snsd-logsearch-values.yaml b/enterprise/minio/1.0.20/ci/snsd-logsearch-values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ci/snsd-logsearch-values.yaml rename to enterprise/minio/1.0.20/ci/snsd-logsearch-values.yaml diff --git a/enterprise/minio/1.0.19/ci/snsd-values.yaml b/enterprise/minio/1.0.20/ci/snsd-values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ci/snsd-values.yaml rename to enterprise/minio/1.0.20/ci/snsd-values.yaml diff --git a/enterprise/minio/1.0.19/ix_values.yaml b/enterprise/minio/1.0.20/ix_values.yaml similarity index 100% rename from enterprise/minio/1.0.19/ix_values.yaml rename to enterprise/minio/1.0.20/ix_values.yaml diff --git a/enterprise/minio/1.0.19/metadata.yaml b/enterprise/minio/1.0.20/metadata.yaml similarity index 100% rename from enterprise/minio/1.0.19/metadata.yaml rename to enterprise/minio/1.0.20/metadata.yaml diff --git a/enterprise/minio/1.0.19/migrations/migrate b/enterprise/minio/1.0.20/migrations/migrate similarity index 100% rename from enterprise/minio/1.0.19/migrations/migrate rename to enterprise/minio/1.0.20/migrations/migrate diff --git a/enterprise/minio/1.0.19/questions.yaml b/enterprise/minio/1.0.20/questions.yaml similarity index 99% rename from enterprise/minio/1.0.19/questions.yaml rename to enterprise/minio/1.0.20/questions.yaml index 231d6f6e93..c31eceb879 100644 --- a/enterprise/minio/1.0.19/questions.yaml +++ b/enterprise/minio/1.0.20/questions.yaml @@ -141,7 +141,7 @@ questions: For Multi Node Multi Drive (MNMD), the entry will look like this:
Example Entry - https://minio{1...3}.example.com:30000/data{1...4}

Note that each host must use the same port number and the same number of storage items.
- In both cases /data{1..4} is the directories to be used for MinIO. + In both cases /data{1...4} is the directories to be used for MinIO. You have to add additional storage for each data entry. schema: type: boolean diff --git a/enterprise/minio/1.0.19/templates/NOTES.txt b/enterprise/minio/1.0.20/templates/NOTES.txt similarity index 100% rename from enterprise/minio/1.0.19/templates/NOTES.txt rename to enterprise/minio/1.0.20/templates/NOTES.txt diff --git a/enterprise/minio/1.0.19/templates/_configuration.tpl b/enterprise/minio/1.0.20/templates/_configuration.tpl similarity index 100% rename from enterprise/minio/1.0.19/templates/_configuration.tpl rename to enterprise/minio/1.0.20/templates/_configuration.tpl diff --git a/enterprise/minio/1.0.19/templates/_helpers.tpl b/enterprise/minio/1.0.20/templates/_helpers.tpl similarity index 81% rename from enterprise/minio/1.0.19/templates/_helpers.tpl rename to enterprise/minio/1.0.20/templates/_helpers.tpl index 9808d6cbc5..770a867fe7 100644 --- a/enterprise/minio/1.0.19/templates/_helpers.tpl +++ b/enterprise/minio/1.0.20/templates/_helpers.tpl @@ -39,7 +39,26 @@ {{- end -}} {{- if and (ne (len .Values.minioStorage) 1) (not .Values.minioMultiMode) -}} - {{- fail "Expected Multi Mode to be enabled, when more than 1 storage items added" -}} + {{- fail "Expected Multi Mode to be enabled, when more than 1 storage mountPaths added" -}} + {{- end -}} + + {{- range $item := .Values.minioMultiMode -}} + {{- if hasPrefix "/" $item -}} + {{- if or (contains "{" $item) (contains "}" $item) -}} + {{- if not (contains "..." $item) -}} + {{- fail "Expected Multi Mode Item to have 3 dots when its a path with expansion eg [/some_path{1...4}]" -}} + {{- end -}} + {{- end -}} + {{- end -}} + {{- end -}} + + {{- $mountPaths := list -}} + {{- range $item := .Values.minioStorage -}} + {{- $mountPaths = mustAppend $mountPaths $item.mountPath -}} + {{- end -}} + + {{- if not (deepEqual ($mountPaths) (uniq $mountPaths)) -}} + {{- fail (printf "Expected mountPaths to be unique, but got [%v]" (join ", " $mountPaths)) -}} {{- end -}} {{- end -}} diff --git a/enterprise/minio/1.0.19/templates/_logsearch.tpl b/enterprise/minio/1.0.20/templates/_logsearch.tpl similarity index 100% rename from enterprise/minio/1.0.19/templates/_logsearch.tpl rename to enterprise/minio/1.0.20/templates/_logsearch.tpl diff --git a/enterprise/minio/1.0.19/templates/_minio.tpl b/enterprise/minio/1.0.20/templates/_minio.tpl similarity index 100% rename from enterprise/minio/1.0.19/templates/_minio.tpl rename to enterprise/minio/1.0.20/templates/_minio.tpl diff --git a/enterprise/minio/1.0.19/templates/_portal.tpl b/enterprise/minio/1.0.20/templates/_portal.tpl similarity index 100% rename from enterprise/minio/1.0.19/templates/_portal.tpl rename to enterprise/minio/1.0.20/templates/_portal.tpl diff --git a/enterprise/minio/1.0.19/templates/_postgres.tpl b/enterprise/minio/1.0.20/templates/_postgres.tpl similarity index 100% rename from enterprise/minio/1.0.19/templates/_postgres.tpl rename to enterprise/minio/1.0.20/templates/_postgres.tpl diff --git a/enterprise/minio/1.0.19/templates/common.yaml b/enterprise/minio/1.0.20/templates/common.yaml similarity index 100% rename from enterprise/minio/1.0.19/templates/common.yaml rename to enterprise/minio/1.0.20/templates/common.yaml diff --git a/enterprise/minio/1.0.19/upgrade_strategy_disable b/enterprise/minio/1.0.20/upgrade_strategy_disable similarity index 100% rename from enterprise/minio/1.0.19/upgrade_strategy_disable rename to enterprise/minio/1.0.20/upgrade_strategy_disable