Merge pull request #105 from truenas/NAS-111605

Adapt minio chart to new console access feature

charts/minio/1.3.7/Chart.yaml → charts/minio/1.3.8/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.7
+version: 1.3.8

test/minio/1.3.7/questions.yaml → charts/minio/1.3.8/questions.yaml

@@ -17,7 +17,7 @@ portals:
     host:
       - "$node_ip"
     ports:
-      - "$variable-service.nodePort"
+      - "$variable-service.consolePort"
 
 questions:
 
@@ -124,13 +124,21 @@ questions:
       required: true
       attrs:
         - variable: nodePort
-          label: "Node Port to use for Minio"
+          label: "Node Port to use for Minio API"
           schema:
             type: int
             min: 9000
             max: 65535
             default: 9000
             required: true
+        - variable: consolePort
+          label: "Node Port to use for Minio UI Access"
+          schema:
+            type: int
+            min: 9000
+            max: 65535
+            default: 9002
+            required: true
 
   - variable: certificate
     description: "Minio Certificate"

test/minio/1.3.7/templates/deployment.yaml → charts/minio/1.3.8/templates/deployment.yaml

@@ -33,10 +33,12 @@ spec:
           command:
             - "/bin/sh"
             - "-ce"
-            - "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server /export {{ (.Values.extraArgs | default list) | join " " }}"
+            - "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server /export --console-address=':9001' {{ (.Values.extraArgs | default list) | join " " }}"
           ports:
-            - name: http
+            - name: api
               containerPort: 9000
+            - name: console
+              containerPort: 9001
           env:
             {{ $secretName := (include "minio.secretName" .) }}
             {{ $envList := (default list .Values.environment) }}

test/minio/1.3.7/templates/service.yaml → charts/minio/1.3.8/templates/service.yaml

@@ -3,7 +3,8 @@
 {{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }}
 {{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }}
 {{ $ports := list }}
-{{ $ports = mustAppend $ports (dict "name" "http" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
+{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
+{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }}
 {{ $params := . }}
 {{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }}
 {{ $_1 := set .Values "extraSelectorLabels" $selectors }}

charts/minio/1.3.7/test_values.yaml → charts/minio/1.3.8/test_values.yaml

@@ -13,4 +13,5 @@ image:
   tag: RELEASE.2021-07-30T00-02-00Z
 service:
   nodePort: 32324
+  consolePort: 32325
 updateStrategy: RollingUpdate

test/minio/1.3.7/Chart.yaml → test/minio/1.3.8/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.7
+version: 1.3.8

charts/minio/1.3.7/questions.yaml → test/minio/1.3.8/questions.yaml

@@ -17,7 +17,7 @@ portals:
     host:
       - "$node_ip"
     ports:
-      - "$variable-service.nodePort"
+      - "$variable-service.consolePort"
 
 questions:
 
@@ -124,13 +124,21 @@ questions:
       required: true
       attrs:
         - variable: nodePort
-          label: "Node Port to use for Minio"
+          label: "Node Port to use for Minio API"
           schema:
             type: int
             min: 9000
             max: 65535
             default: 9000
             required: true
+        - variable: consolePort
+          label: "Node Port to use for Minio UI Access"
+          schema:
+            type: int
+            min: 9000
+            max: 65535
+            default: 9002
+            required: true
 
   - variable: certificate
     description: "Minio Certificate"

charts/minio/1.3.7/templates/deployment.yaml → test/minio/1.3.8/templates/deployment.yaml

@@ -33,10 +33,12 @@ spec:
           command:
             - "/bin/sh"
             - "-ce"
-            - "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server /export {{ (.Values.extraArgs | default list) | join " " }}"
+            - "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server /export --console-address=':9001' {{ (.Values.extraArgs | default list) | join " " }}"
           ports:
-            - name: http
+            - name: api
               containerPort: 9000
+            - name: console
+              containerPort: 9001
           env:
             {{ $secretName := (include "minio.secretName" .) }}
             {{ $envList := (default list .Values.environment) }}

charts/minio/1.3.7/templates/service.yaml → test/minio/1.3.8/templates/service.yaml

@@ -3,7 +3,8 @@
 {{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }}
 {{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }}
 {{ $ports := list }}
-{{ $ports = mustAppend $ports (dict "name" "http" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
+{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
+{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }}
 {{ $params := . }}
 {{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }}
 {{ $_1 := set .Values "extraSelectorLabels" $selectors }}

test/minio/1.3.7/test_values.yaml → test/minio/1.3.8/test_values.yaml

@@ -13,4 +13,5 @@ image:
   tag: RELEASE.2021-07-30T00-02-00Z
 service:
   nodePort: 32324
+  consolePort: 32325
 updateStrategy: RollingUpdate