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 <josh@webhosting.coop>

* Removing default_values.yaml as per request

Signed-off-by: Josh Cox <josh@webhosting.coop>

* 1.3.12

Signed-off-by: Josh Cox <josh@webhosting.coop>

* Moving test

charts/minio/1.3.11/Chart.yaml → 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

test/minio/1.3.11/questions.yaml → 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

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

test/minio/1.3.11/default_values.yaml

@@ -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"

test/minio/1.3.11/Chart.yaml → 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

charts/minio/1.3.11/questions.yaml → 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

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