Merge pull request #648 from truenas/NAS-117445

NAS-117445 / 22.12 / Make minio data mount path configurable

charts/minio/1.6.39/Chart.yaml → charts/minio/1.6.40/Chart.yaml

@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.6.39
+version: 1.6.40

test/minio/1.6.39/questions.yaml → charts/minio/1.6.40/questions.yaml

@@ -211,9 +211,8 @@ questions:
                 description: "Path where the volume will be mounted inside the pod"
                 schema:
                   type: path
-                  hidden: true
-                  editable: false
                   default: "/export"
+                  immutable: true
               - variable: hostPathEnabled
                 label: "Enable Host Path for Minio Data Volume"
                 schema:

test/minio/1.6.39/templates/_helpers.tpl → charts/minio/1.6.40/templates/_helpers.tpl

@@ -60,7 +60,7 @@ Retrieve command for minio application
 {{- if .Values.distributedMode -}}
 {{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}}
 {{- else -}}
-{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
+{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list (printf "%s" .Values.appVolumeMounts.export.mountPath)) (.Values.extraArgs | default list)) | join " ") -}}
 {{- end -}}
 {{- end -}}
 

test/minio/1.6.39/Chart.yaml → test/minio/1.6.40/Chart.yaml

@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.6.39
+version: 1.6.40

charts/minio/1.6.39/questions.yaml → test/minio/1.6.40/questions.yaml

@@ -211,9 +211,8 @@ questions:
                 description: "Path where the volume will be mounted inside the pod"
                 schema:
                   type: path
-                  hidden: true
-                  editable: false
                   default: "/export"
+                  immutable: true
               - variable: hostPathEnabled
                 label: "Enable Host Path for Minio Data Volume"
                 schema:

charts/minio/1.6.39/templates/_helpers.tpl → test/minio/1.6.40/templates/_helpers.tpl

@@ -60,7 +60,7 @@ Retrieve command for minio application
 {{- if .Values.distributedMode -}}
 {{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}}
 {{- else -}}
-{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
+{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list (printf "%s" .Values.appVolumeMounts.export.mountPath)) (.Values.extraArgs | default list)) | join " ") -}}
 {{- end -}}
 {{- end -}}