Browse Source

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

NAS-111740 / 21.08 / Bug fix for specifying env variables for minio app
Waqar Ahmed 4 năm trước cách đây
mục cha
commit
9ff4cbf31b
40 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 0 0
      charts/minio/1.3.10/.helmignore
  2. 1 1
      charts/minio/1.3.10/Chart.yaml
  3. 0 0
      charts/minio/1.3.10/README.md
  4. 0 0
      charts/minio/1.3.10/app-readme.md
  5. 0 0
      charts/minio/1.3.10/charts/common-2105.0.0.tgz
  6. 0 0
      charts/minio/1.3.10/default_values.yaml
  7. 0 0
      charts/minio/1.3.10/ix_values.yaml
  8. 0 0
      charts/minio/1.3.10/migrations/migrate_from_1.0.0
  9. 0 0
      charts/minio/1.3.10/questions.yaml
  10. 0 0
      charts/minio/1.3.10/requirements.lock
  11. 0 0
      charts/minio/1.3.10/templates/NOTES.txt
  12. 0 0
      charts/minio/1.3.10/templates/_cert.tpl
  13. 0 0
      charts/minio/1.3.10/templates/_helpers.tpl
  14. 0 0
      charts/minio/1.3.10/templates/configmap.yaml
  15. 1 1
      charts/minio/1.3.10/templates/deployment.yaml
  16. 0 0
      charts/minio/1.3.10/templates/secrets.yaml
  17. 0 0
      charts/minio/1.3.10/templates/service.yaml
  18. 0 0
      charts/minio/1.3.10/templates/serviceaccount.yaml
  19. 0 0
      charts/minio/1.3.10/test_values.yaml
  20. 0 0
      charts/minio/1.3.10/values.yaml
  21. 0 0
      test/minio/1.3.10/.helmignore
  22. 1 1
      test/minio/1.3.10/Chart.yaml
  23. 0 0
      test/minio/1.3.10/README.md
  24. 0 0
      test/minio/1.3.10/app-readme.md
  25. 0 0
      test/minio/1.3.10/charts/common-2105.0.0.tgz
  26. 0 0
      test/minio/1.3.10/default_values.yaml
  27. 0 0
      test/minio/1.3.10/ix_values.yaml
  28. 0 0
      test/minio/1.3.10/migrations/migrate_from_1.0.0
  29. 0 0
      test/minio/1.3.10/questions.yaml
  30. 0 0
      test/minio/1.3.10/requirements.lock
  31. 0 0
      test/minio/1.3.10/templates/NOTES.txt
  32. 0 0
      test/minio/1.3.10/templates/_cert.tpl
  33. 0 0
      test/minio/1.3.10/templates/_helpers.tpl
  34. 0 0
      test/minio/1.3.10/templates/configmap.yaml
  35. 1 1
      test/minio/1.3.10/templates/deployment.yaml
  36. 0 0
      test/minio/1.3.10/templates/secrets.yaml
  37. 0 0
      test/minio/1.3.10/templates/service.yaml
  38. 0 0
      test/minio/1.3.10/templates/serviceaccount.yaml
  39. 0 0
      test/minio/1.3.10/test_values.yaml
  40. 0 0
      test/minio/1.3.10/values.yaml

+ 0 - 0
charts/minio/1.3.9/.helmignore → charts/minio/1.3.10/.helmignore


+ 1 - 1
charts/minio/1.3.9/Chart.yaml → 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

+ 0 - 0
charts/minio/1.3.9/README.md → charts/minio/1.3.10/README.md


+ 0 - 0
charts/minio/1.3.9/app-readme.md → charts/minio/1.3.10/app-readme.md


+ 0 - 0
charts/minio/1.3.9/charts/common-2105.0.0.tgz → charts/minio/1.3.10/charts/common-2105.0.0.tgz


+ 0 - 0
charts/minio/1.3.9/default_values.yaml → charts/minio/1.3.10/default_values.yaml


+ 0 - 0
charts/minio/1.3.9/ix_values.yaml → charts/minio/1.3.10/ix_values.yaml


+ 0 - 0
charts/minio/1.3.9/migrations/migrate_from_1.0.0 → charts/minio/1.3.10/migrations/migrate_from_1.0.0


+ 0 - 0
charts/minio/1.3.9/questions.yaml → charts/minio/1.3.10/questions.yaml


+ 0 - 0
charts/minio/1.3.9/requirements.lock → charts/minio/1.3.10/requirements.lock


+ 0 - 0
charts/minio/1.3.9/templates/NOTES.txt → charts/minio/1.3.10/templates/NOTES.txt


+ 0 - 0
charts/minio/1.3.9/templates/_cert.tpl → charts/minio/1.3.10/templates/_cert.tpl


+ 0 - 0
charts/minio/1.3.9/templates/_helpers.tpl → charts/minio/1.3.10/templates/_helpers.tpl


+ 0 - 0
charts/minio/1.3.9/templates/configmap.yaml → charts/minio/1.3.10/templates/configmap.yaml


+ 1 - 1
charts/minio/1.3.9/templates/deployment.yaml → 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 }}

+ 0 - 0
charts/minio/1.3.9/templates/secrets.yaml → charts/minio/1.3.10/templates/secrets.yaml


+ 0 - 0
charts/minio/1.3.9/templates/service.yaml → charts/minio/1.3.10/templates/service.yaml


+ 0 - 0
charts/minio/1.3.9/templates/serviceaccount.yaml → charts/minio/1.3.10/templates/serviceaccount.yaml


+ 0 - 0
charts/minio/1.3.9/test_values.yaml → charts/minio/1.3.10/test_values.yaml


+ 0 - 0
charts/minio/1.3.9/values.yaml → charts/minio/1.3.10/values.yaml


+ 0 - 0
test/minio/1.3.9/.helmignore → test/minio/1.3.10/.helmignore


+ 1 - 1
test/minio/1.3.9/Chart.yaml → 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

+ 0 - 0
test/minio/1.3.9/README.md → test/minio/1.3.10/README.md


+ 0 - 0
test/minio/1.3.9/app-readme.md → test/minio/1.3.10/app-readme.md


+ 0 - 0
test/minio/1.3.9/charts/common-2105.0.0.tgz → test/minio/1.3.10/charts/common-2105.0.0.tgz


+ 0 - 0
test/minio/1.3.9/default_values.yaml → test/minio/1.3.10/default_values.yaml


+ 0 - 0
test/minio/1.3.9/ix_values.yaml → test/minio/1.3.10/ix_values.yaml


+ 0 - 0
test/minio/1.3.9/migrations/migrate_from_1.0.0 → test/minio/1.3.10/migrations/migrate_from_1.0.0


+ 0 - 0
test/minio/1.3.9/questions.yaml → test/minio/1.3.10/questions.yaml


+ 0 - 0
test/minio/1.3.9/requirements.lock → test/minio/1.3.10/requirements.lock


+ 0 - 0
test/minio/1.3.9/templates/NOTES.txt → test/minio/1.3.10/templates/NOTES.txt


+ 0 - 0
test/minio/1.3.9/templates/_cert.tpl → test/minio/1.3.10/templates/_cert.tpl


+ 0 - 0
test/minio/1.3.9/templates/_helpers.tpl → test/minio/1.3.10/templates/_helpers.tpl


+ 0 - 0
test/minio/1.3.9/templates/configmap.yaml → test/minio/1.3.10/templates/configmap.yaml


+ 1 - 1
test/minio/1.3.9/templates/deployment.yaml → 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 }}

+ 0 - 0
test/minio/1.3.9/templates/secrets.yaml → test/minio/1.3.10/templates/secrets.yaml


+ 0 - 0
test/minio/1.3.9/templates/service.yaml → test/minio/1.3.10/templates/service.yaml


+ 0 - 0
test/minio/1.3.9/templates/serviceaccount.yaml → test/minio/1.3.10/templates/serviceaccount.yaml


+ 0 - 0
test/minio/1.3.9/test_values.yaml → test/minio/1.3.10/test_values.yaml


+ 0 - 0
test/minio/1.3.9/values.yaml → test/minio/1.3.10/values.yaml