From 5cd292fb0634ef89c86812c23a7f9c0de372afc5 Mon Sep 17 00:00:00 2001 From: Josh Cox Date: Mon, 16 Aug 2021 09:26:15 -0500 Subject: [PATCH] NAS-111810 / 21.08 / Fixes #116 by swapping MINIO_ACCESS_KEY and MINIO_SECRET_KEY (#117) * Fixes #116 by swapping MINIO_ACCESS_KEY and MINIO_SECRET_KEY with MINIO_ROOT_USER and MINIO_ROOT_PASSWORD Signed-off-by: Josh Cox * Removing default_values.yaml as per request Signed-off-by: Josh Cox * 1.3.12 Signed-off-by: Josh Cox * Moving test --- charts/minio/{1.3.11 => 1.3.12}/.helmignore | 0 charts/minio/{1.3.11 => 1.3.12}/Chart.yaml | 2 +- charts/minio/{1.3.11 => 1.3.12}/README.md | 0 charts/minio/{1.3.11 => 1.3.12}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../minio/{1.3.11 => 1.3.12}/ix_values.yaml | 0 .../migrations/migrate_from_1.0.0 | 0 .../minio/1.3.12}/questions.yaml | 8 +++---- .../{1.3.11 => 1.3.12}/requirements.lock | 0 .../{1.3.11 => 1.3.12}/templates/NOTES.txt | 0 .../{1.3.11 => 1.3.12}/templates/_cert.tpl | 0 .../{1.3.11 => 1.3.12}/templates/_helpers.tpl | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 4 ++-- .../{1.3.11 => 1.3.12}/templates/secrets.yaml | 0 .../{1.3.11 => 1.3.12}/templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../minio/{1.3.11 => 1.3.12}/test_values.yaml | 0 charts/minio/{1.3.11 => 1.3.12}/values.yaml | 0 test/minio/1.3.11/default_values.yaml | 22 ------------------ test/minio/{1.3.11 => 1.3.12}/.helmignore | 0 test/minio/{1.3.11 => 1.3.12}/Chart.yaml | 2 +- test/minio/{1.3.11 => 1.3.12}/README.md | 0 test/minio/{1.3.11 => 1.3.12}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../minio/1.3.12}/default_values.yaml | 0 test/minio/{1.3.11 => 1.3.12}/ix_values.yaml | 0 .../migrations/migrate_from_1.0.0 | 0 .../minio/1.3.12}/questions.yaml | 8 +++---- .../{1.3.11 => 1.3.12}/requirements.lock | 0 .../{1.3.11 => 1.3.12}/templates/NOTES.txt | 0 .../{1.3.11 => 1.3.12}/templates/_cert.tpl | 0 .../{1.3.11 => 1.3.12}/templates/_helpers.tpl | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 4 ++-- .../{1.3.11 => 1.3.12}/templates/secrets.yaml | 0 .../{1.3.11 => 1.3.12}/templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../minio/{1.3.11 => 1.3.12}/test_values.yaml | 0 test/minio/{1.3.11 => 1.3.12}/values.yaml | 0 40 files changed, 14 insertions(+), 36 deletions(-) rename charts/minio/{1.3.11 => 1.3.12}/.helmignore (100%) rename charts/minio/{1.3.11 => 1.3.12}/Chart.yaml (96%) rename charts/minio/{1.3.11 => 1.3.12}/README.md (100%) rename charts/minio/{1.3.11 => 1.3.12}/app-readme.md (100%) rename charts/minio/{1.3.11 => 1.3.12}/charts/common-2105.0.0.tgz (100%) rename charts/minio/{1.3.11 => 1.3.12}/ix_values.yaml (100%) rename charts/minio/{1.3.11 => 1.3.12}/migrations/migrate_from_1.0.0 (100%) rename {test/minio/1.3.11 => charts/minio/1.3.12}/questions.yaml (97%) rename charts/minio/{1.3.11 => 1.3.12}/requirements.lock (100%) rename charts/minio/{1.3.11 => 1.3.12}/templates/NOTES.txt (100%) rename charts/minio/{1.3.11 => 1.3.12}/templates/_cert.tpl (100%) rename charts/minio/{1.3.11 => 1.3.12}/templates/_helpers.tpl (100%) rename charts/minio/{1.3.11 => 1.3.12}/templates/configmap.yaml (100%) rename charts/minio/{1.3.11 => 1.3.12}/templates/deployment.yaml (93%) rename charts/minio/{1.3.11 => 1.3.12}/templates/secrets.yaml (100%) rename charts/minio/{1.3.11 => 1.3.12}/templates/service.yaml (100%) rename charts/minio/{1.3.11 => 1.3.12}/templates/serviceaccount.yaml (100%) rename charts/minio/{1.3.11 => 1.3.12}/test_values.yaml (100%) rename charts/minio/{1.3.11 => 1.3.12}/values.yaml (100%) delete mode 100644 test/minio/1.3.11/default_values.yaml rename test/minio/{1.3.11 => 1.3.12}/.helmignore (100%) rename test/minio/{1.3.11 => 1.3.12}/Chart.yaml (96%) rename test/minio/{1.3.11 => 1.3.12}/README.md (100%) rename test/minio/{1.3.11 => 1.3.12}/app-readme.md (100%) rename test/minio/{1.3.11 => 1.3.12}/charts/common-2105.0.0.tgz (100%) rename {charts/minio/1.3.11 => test/minio/1.3.12}/default_values.yaml (100%) rename test/minio/{1.3.11 => 1.3.12}/ix_values.yaml (100%) rename test/minio/{1.3.11 => 1.3.12}/migrations/migrate_from_1.0.0 (100%) rename {charts/minio/1.3.11 => test/minio/1.3.12}/questions.yaml (97%) rename test/minio/{1.3.11 => 1.3.12}/requirements.lock (100%) rename test/minio/{1.3.11 => 1.3.12}/templates/NOTES.txt (100%) rename test/minio/{1.3.11 => 1.3.12}/templates/_cert.tpl (100%) rename test/minio/{1.3.11 => 1.3.12}/templates/_helpers.tpl (100%) rename test/minio/{1.3.11 => 1.3.12}/templates/configmap.yaml (100%) rename test/minio/{1.3.11 => 1.3.12}/templates/deployment.yaml (93%) rename test/minio/{1.3.11 => 1.3.12}/templates/secrets.yaml (100%) rename test/minio/{1.3.11 => 1.3.12}/templates/service.yaml (100%) rename test/minio/{1.3.11 => 1.3.12}/templates/serviceaccount.yaml (100%) rename test/minio/{1.3.11 => 1.3.12}/test_values.yaml (100%) rename test/minio/{1.3.11 => 1.3.12}/values.yaml (100%) diff --git a/charts/minio/1.3.11/.helmignore b/charts/minio/1.3.12/.helmignore similarity index 100% rename from charts/minio/1.3.11/.helmignore rename to charts/minio/1.3.12/.helmignore diff --git a/charts/minio/1.3.11/Chart.yaml b/charts/minio/1.3.12/Chart.yaml similarity index 96% rename from charts/minio/1.3.11/Chart.yaml rename to charts/minio/1.3.12/Chart.yaml index fe60094148..f35232f84c 100644 --- a/charts/minio/1.3.11/Chart.yaml +++ b/charts/minio/1.3.12/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.11 +version: 1.3.12 diff --git a/charts/minio/1.3.11/README.md b/charts/minio/1.3.12/README.md similarity index 100% rename from charts/minio/1.3.11/README.md rename to charts/minio/1.3.12/README.md diff --git a/charts/minio/1.3.11/app-readme.md b/charts/minio/1.3.12/app-readme.md similarity index 100% rename from charts/minio/1.3.11/app-readme.md rename to charts/minio/1.3.12/app-readme.md diff --git a/charts/minio/1.3.11/charts/common-2105.0.0.tgz b/charts/minio/1.3.12/charts/common-2105.0.0.tgz similarity index 100% rename from charts/minio/1.3.11/charts/common-2105.0.0.tgz rename to charts/minio/1.3.12/charts/common-2105.0.0.tgz diff --git a/charts/minio/1.3.11/ix_values.yaml b/charts/minio/1.3.12/ix_values.yaml similarity index 100% rename from charts/minio/1.3.11/ix_values.yaml rename to charts/minio/1.3.12/ix_values.yaml diff --git a/charts/minio/1.3.11/migrations/migrate_from_1.0.0 b/charts/minio/1.3.12/migrations/migrate_from_1.0.0 similarity index 100% rename from charts/minio/1.3.11/migrations/migrate_from_1.0.0 rename to charts/minio/1.3.12/migrations/migrate_from_1.0.0 diff --git a/test/minio/1.3.11/questions.yaml b/charts/minio/1.3.12/questions.yaml similarity index 97% rename from test/minio/1.3.11/questions.yaml rename to charts/minio/1.3.12/questions.yaml index c426bb7322..155ea73788 100644 --- a/test/minio/1.3.11/questions.yaml +++ b/charts/minio/1.3.12/questions.yaml @@ -73,9 +73,9 @@ questions: type: string - variable: accessKey - label: "Access Key" + label: "Root User" group: "Minio Configuration" - description: "Enter the S3 access ID" + description: "Enter the S3 Root User" schema: type: string private: true @@ -84,9 +84,9 @@ questions: max_length: 20 - variable: secretKey - label: "Secret Key" + label: "Root Password" group: "Minio Configuration" - description: "Enter the S3 secret access key" + description: "Enter the S3 Root Password" schema: type: string private: true diff --git a/charts/minio/1.3.11/requirements.lock b/charts/minio/1.3.12/requirements.lock similarity index 100% rename from charts/minio/1.3.11/requirements.lock rename to charts/minio/1.3.12/requirements.lock diff --git a/charts/minio/1.3.11/templates/NOTES.txt b/charts/minio/1.3.12/templates/NOTES.txt similarity index 100% rename from charts/minio/1.3.11/templates/NOTES.txt rename to charts/minio/1.3.12/templates/NOTES.txt diff --git a/charts/minio/1.3.11/templates/_cert.tpl b/charts/minio/1.3.12/templates/_cert.tpl similarity index 100% rename from charts/minio/1.3.11/templates/_cert.tpl rename to charts/minio/1.3.12/templates/_cert.tpl diff --git a/charts/minio/1.3.11/templates/_helpers.tpl b/charts/minio/1.3.12/templates/_helpers.tpl similarity index 100% rename from charts/minio/1.3.11/templates/_helpers.tpl rename to charts/minio/1.3.12/templates/_helpers.tpl diff --git a/charts/minio/1.3.11/templates/configmap.yaml b/charts/minio/1.3.12/templates/configmap.yaml similarity index 100% rename from charts/minio/1.3.11/templates/configmap.yaml rename to charts/minio/1.3.12/templates/configmap.yaml diff --git a/charts/minio/1.3.11/templates/deployment.yaml b/charts/minio/1.3.12/templates/deployment.yaml similarity index 93% rename from charts/minio/1.3.11/templates/deployment.yaml rename to charts/minio/1.3.12/templates/deployment.yaml index d3f1a16a14..f2e82b1f68 100644 --- a/charts/minio/1.3.11/templates/deployment.yaml +++ b/charts/minio/1.3.12/templates/deployment.yaml @@ -46,8 +46,8 @@ spec: {{ $envList = mustAppend $envList (dict "name" "MINIO_BROWSER_REDIRECT_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.consolePort | int))) }} {{ $envList = mustAppend $envList (dict "name" "MINIO_SERVER_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.nodePort | int))) }} {{ end }} - {{ $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") }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} {{ include "common.storage.allAppVolumes" .Values | nindent 6 }} diff --git a/charts/minio/1.3.11/templates/secrets.yaml b/charts/minio/1.3.12/templates/secrets.yaml similarity index 100% rename from charts/minio/1.3.11/templates/secrets.yaml rename to charts/minio/1.3.12/templates/secrets.yaml diff --git a/charts/minio/1.3.11/templates/service.yaml b/charts/minio/1.3.12/templates/service.yaml similarity index 100% rename from charts/minio/1.3.11/templates/service.yaml rename to charts/minio/1.3.12/templates/service.yaml diff --git a/charts/minio/1.3.11/templates/serviceaccount.yaml b/charts/minio/1.3.12/templates/serviceaccount.yaml similarity index 100% rename from charts/minio/1.3.11/templates/serviceaccount.yaml rename to charts/minio/1.3.12/templates/serviceaccount.yaml diff --git a/charts/minio/1.3.11/test_values.yaml b/charts/minio/1.3.12/test_values.yaml similarity index 100% rename from charts/minio/1.3.11/test_values.yaml rename to charts/minio/1.3.12/test_values.yaml diff --git a/charts/minio/1.3.11/values.yaml b/charts/minio/1.3.12/values.yaml similarity index 100% rename from charts/minio/1.3.11/values.yaml rename to charts/minio/1.3.12/values.yaml diff --git a/test/minio/1.3.11/default_values.yaml b/test/minio/1.3.11/default_values.yaml deleted file mode 100644 index 7afa31dc0d..0000000000 --- a/test/minio/1.3.11/default_values.yaml +++ /dev/null @@ -1,22 +0,0 @@ -## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the -## -image: - repository: minio/minio - tag: RELEASE.2020-11-19T23-48-16Z - pullPolicy: IfNotPresent - -## Additional arguments to pass to minio binary -extraArgs: [] - -updateStrategy: RollingUpdate - -service: - nodePort: 9000 - -environment: - ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html - -appVolumeMounts: - export: - emptyDir: true - mountPath: "/export" diff --git a/test/minio/1.3.11/.helmignore b/test/minio/1.3.12/.helmignore similarity index 100% rename from test/minio/1.3.11/.helmignore rename to test/minio/1.3.12/.helmignore diff --git a/test/minio/1.3.11/Chart.yaml b/test/minio/1.3.12/Chart.yaml similarity index 96% rename from test/minio/1.3.11/Chart.yaml rename to test/minio/1.3.12/Chart.yaml index fe60094148..f35232f84c 100644 --- a/test/minio/1.3.11/Chart.yaml +++ b/test/minio/1.3.12/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.11 +version: 1.3.12 diff --git a/test/minio/1.3.11/README.md b/test/minio/1.3.12/README.md similarity index 100% rename from test/minio/1.3.11/README.md rename to test/minio/1.3.12/README.md diff --git a/test/minio/1.3.11/app-readme.md b/test/minio/1.3.12/app-readme.md similarity index 100% rename from test/minio/1.3.11/app-readme.md rename to test/minio/1.3.12/app-readme.md diff --git a/test/minio/1.3.11/charts/common-2105.0.0.tgz b/test/minio/1.3.12/charts/common-2105.0.0.tgz similarity index 100% rename from test/minio/1.3.11/charts/common-2105.0.0.tgz rename to test/minio/1.3.12/charts/common-2105.0.0.tgz diff --git a/charts/minio/1.3.11/default_values.yaml b/test/minio/1.3.12/default_values.yaml similarity index 100% rename from charts/minio/1.3.11/default_values.yaml rename to test/minio/1.3.12/default_values.yaml diff --git a/test/minio/1.3.11/ix_values.yaml b/test/minio/1.3.12/ix_values.yaml similarity index 100% rename from test/minio/1.3.11/ix_values.yaml rename to test/minio/1.3.12/ix_values.yaml diff --git a/test/minio/1.3.11/migrations/migrate_from_1.0.0 b/test/minio/1.3.12/migrations/migrate_from_1.0.0 similarity index 100% rename from test/minio/1.3.11/migrations/migrate_from_1.0.0 rename to test/minio/1.3.12/migrations/migrate_from_1.0.0 diff --git a/charts/minio/1.3.11/questions.yaml b/test/minio/1.3.12/questions.yaml similarity index 97% rename from charts/minio/1.3.11/questions.yaml rename to test/minio/1.3.12/questions.yaml index c426bb7322..155ea73788 100644 --- a/charts/minio/1.3.11/questions.yaml +++ b/test/minio/1.3.12/questions.yaml @@ -73,9 +73,9 @@ questions: type: string - variable: accessKey - label: "Access Key" + label: "Root User" group: "Minio Configuration" - description: "Enter the S3 access ID" + description: "Enter the S3 Root User" schema: type: string private: true @@ -84,9 +84,9 @@ questions: max_length: 20 - variable: secretKey - label: "Secret Key" + label: "Root Password" group: "Minio Configuration" - description: "Enter the S3 secret access key" + description: "Enter the S3 Root Password" schema: type: string private: true diff --git a/test/minio/1.3.11/requirements.lock b/test/minio/1.3.12/requirements.lock similarity index 100% rename from test/minio/1.3.11/requirements.lock rename to test/minio/1.3.12/requirements.lock diff --git a/test/minio/1.3.11/templates/NOTES.txt b/test/minio/1.3.12/templates/NOTES.txt similarity index 100% rename from test/minio/1.3.11/templates/NOTES.txt rename to test/minio/1.3.12/templates/NOTES.txt diff --git a/test/minio/1.3.11/templates/_cert.tpl b/test/minio/1.3.12/templates/_cert.tpl similarity index 100% rename from test/minio/1.3.11/templates/_cert.tpl rename to test/minio/1.3.12/templates/_cert.tpl diff --git a/test/minio/1.3.11/templates/_helpers.tpl b/test/minio/1.3.12/templates/_helpers.tpl similarity index 100% rename from test/minio/1.3.11/templates/_helpers.tpl rename to test/minio/1.3.12/templates/_helpers.tpl diff --git a/test/minio/1.3.11/templates/configmap.yaml b/test/minio/1.3.12/templates/configmap.yaml similarity index 100% rename from test/minio/1.3.11/templates/configmap.yaml rename to test/minio/1.3.12/templates/configmap.yaml diff --git a/test/minio/1.3.11/templates/deployment.yaml b/test/minio/1.3.12/templates/deployment.yaml similarity index 93% rename from test/minio/1.3.11/templates/deployment.yaml rename to test/minio/1.3.12/templates/deployment.yaml index d3f1a16a14..f2e82b1f68 100644 --- a/test/minio/1.3.11/templates/deployment.yaml +++ b/test/minio/1.3.12/templates/deployment.yaml @@ -46,8 +46,8 @@ spec: {{ $envList = mustAppend $envList (dict "name" "MINIO_BROWSER_REDIRECT_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.consolePort | int))) }} {{ $envList = mustAppend $envList (dict "name" "MINIO_SERVER_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.nodePort | int))) }} {{ end }} - {{ $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") }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} {{ include "common.storage.allAppVolumes" .Values | nindent 6 }} diff --git a/test/minio/1.3.11/templates/secrets.yaml b/test/minio/1.3.12/templates/secrets.yaml similarity index 100% rename from test/minio/1.3.11/templates/secrets.yaml rename to test/minio/1.3.12/templates/secrets.yaml diff --git a/test/minio/1.3.11/templates/service.yaml b/test/minio/1.3.12/templates/service.yaml similarity index 100% rename from test/minio/1.3.11/templates/service.yaml rename to test/minio/1.3.12/templates/service.yaml diff --git a/test/minio/1.3.11/templates/serviceaccount.yaml b/test/minio/1.3.12/templates/serviceaccount.yaml similarity index 100% rename from test/minio/1.3.11/templates/serviceaccount.yaml rename to test/minio/1.3.12/templates/serviceaccount.yaml diff --git a/test/minio/1.3.11/test_values.yaml b/test/minio/1.3.12/test_values.yaml similarity index 100% rename from test/minio/1.3.11/test_values.yaml rename to test/minio/1.3.12/test_values.yaml diff --git a/test/minio/1.3.11/values.yaml b/test/minio/1.3.12/values.yaml similarity index 100% rename from test/minio/1.3.11/values.yaml rename to test/minio/1.3.12/values.yaml