Merge pull request #111 from truenas/fix-env-vars-minio

NAS-111740 / 21.08 / Bug fix for specifying env variables for minio app
2026-04-09 21:59:10 +08:00 · 2021-08-08 17:51:57 +05:00
parent 8dd9b626c0 2e82e06fad
commit 9ff4cbf31b
40 changed files with 4 additions and 4 deletions
--- a/charts/minio/1.3.10/.helmignore
+++ b/charts/minio/1.3.10/.helmignore
--- a/charts/minio/1.3.10/Chart.yaml
+++ b/charts/minio/1.3.10/Chart.yaml
@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.3.9
+version: 1.3.10
--- a/charts/minio/1.3.10/README.md
+++ b/charts/minio/1.3.10/README.md
--- a/charts/minio/1.3.10/app-readme.md
+++ b/charts/minio/1.3.10/app-readme.md
--- a/charts/minio/1.3.10/charts/common-2105.0.0.tgz
+++ b/charts/minio/1.3.10/charts/common-2105.0.0.tgz
--- a/charts/minio/1.3.10/default_values.yaml
+++ b/charts/minio/1.3.10/default_values.yaml
--- a/charts/minio/1.3.10/ix_values.yaml
+++ b/charts/minio/1.3.10/ix_values.yaml
--- a/charts/minio/1.3.10/migrations/migrate_from_1.0.0
+++ b/charts/minio/1.3.10/migrations/migrate_from_1.0.0
--- a/charts/minio/1.3.10/questions.yaml
+++ b/charts/minio/1.3.10/questions.yaml
--- a/charts/minio/1.3.10/requirements.lock
+++ b/charts/minio/1.3.10/requirements.lock
--- a/charts/minio/1.3.10/templates/NOTES.txt
+++ b/charts/minio/1.3.10/templates/NOTES.txt
--- a/charts/minio/1.3.10/templates/_cert.tpl
+++ b/charts/minio/1.3.10/templates/_cert.tpl
--- a/charts/minio/1.3.10/templates/_helpers.tpl
+++ b/charts/minio/1.3.10/templates/_helpers.tpl
--- a/charts/minio/1.3.10/templates/configmap.yaml
+++ b/charts/minio/1.3.10/templates/configmap.yaml
--- a/charts/minio/1.3.10/templates/deployment.yaml
+++ b/charts/minio/1.3.10/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
              containerPort: 9001
          env:
            {{ $secretName := (include "minio.secretName" .) }}
-            {{ $envList := (default list .Values.environment) }}
+            {{ $envList := (default list .Values.environmentVariables) }}
            {{ $envList = mustAppend $envList (dict "name" "MINIO_ACCESS_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }}
            {{ $envList = mustAppend $envList (dict "name" "MINIO_SECRET_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }}
            {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }}
--- a/charts/minio/1.3.10/templates/secrets.yaml
+++ b/charts/minio/1.3.10/templates/secrets.yaml
--- a/charts/minio/1.3.10/templates/service.yaml
+++ b/charts/minio/1.3.10/templates/service.yaml
--- a/charts/minio/1.3.10/templates/serviceaccount.yaml
+++ b/charts/minio/1.3.10/templates/serviceaccount.yaml
--- a/charts/minio/1.3.10/test_values.yaml
+++ b/charts/minio/1.3.10/test_values.yaml
--- a/charts/minio/1.3.10/values.yaml
+++ b/charts/minio/1.3.10/values.yaml
--- a/test/minio/1.3.10/.helmignore
+++ b/test/minio/1.3.10/.helmignore
--- a/test/minio/1.3.10/Chart.yaml
+++ b/test/minio/1.3.10/Chart.yaml
@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.3.9
+version: 1.3.10
--- a/test/minio/1.3.10/README.md
+++ b/test/minio/1.3.10/README.md
--- a/test/minio/1.3.10/app-readme.md
+++ b/test/minio/1.3.10/app-readme.md
--- a/test/minio/1.3.10/charts/common-2105.0.0.tgz
+++ b/test/minio/1.3.10/charts/common-2105.0.0.tgz
--- a/test/minio/1.3.10/default_values.yaml
+++ b/test/minio/1.3.10/default_values.yaml
--- a/test/minio/1.3.10/ix_values.yaml
+++ b/test/minio/1.3.10/ix_values.yaml
--- a/test/minio/1.3.10/migrations/migrate_from_1.0.0
+++ b/test/minio/1.3.10/migrations/migrate_from_1.0.0
--- a/test/minio/1.3.10/questions.yaml
+++ b/test/minio/1.3.10/questions.yaml
--- a/test/minio/1.3.10/requirements.lock
+++ b/test/minio/1.3.10/requirements.lock
--- a/test/minio/1.3.10/templates/NOTES.txt
+++ b/test/minio/1.3.10/templates/NOTES.txt
--- a/test/minio/1.3.10/templates/_cert.tpl
+++ b/test/minio/1.3.10/templates/_cert.tpl
--- a/test/minio/1.3.10/templates/_helpers.tpl
+++ b/test/minio/1.3.10/templates/_helpers.tpl
--- a/test/minio/1.3.10/templates/configmap.yaml
+++ b/test/minio/1.3.10/templates/configmap.yaml
--- a/test/minio/1.3.10/templates/deployment.yaml
+++ b/test/minio/1.3.10/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
              containerPort: 9001
          env:
            {{ $secretName := (include "minio.secretName" .) }}
-            {{ $envList := (default list .Values.environment) }}
+            {{ $envList := (default list .Values.environmentVariables) }}
            {{ $envList = mustAppend $envList (dict "name" "MINIO_ACCESS_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }}
            {{ $envList = mustAppend $envList (dict "name" "MINIO_SECRET_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }}
            {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }}
--- a/test/minio/1.3.10/templates/secrets.yaml
+++ b/test/minio/1.3.10/templates/secrets.yaml
--- a/test/minio/1.3.10/templates/service.yaml
+++ b/test/minio/1.3.10/templates/service.yaml
--- a/test/minio/1.3.10/templates/serviceaccount.yaml
+++ b/test/minio/1.3.10/templates/serviceaccount.yaml
--- a/test/minio/1.3.10/test_values.yaml
+++ b/test/minio/1.3.10/test_values.yaml
--- a/test/minio/1.3.10/values.yaml
+++ b/test/minio/1.3.10/values.yaml