Add updated version of minio to charts train

charts/minio/1.1.0/templates/_helpers.tpl

@@ -1,6 +0,0 @@
-{{/*
-Determine secret name.
-*/}}
-{{- define "minio.secretName" -}}
-{{- include "common.names.fullname" . -}}
-{{- end -}}

charts/minio/1.2.1/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 description: High Performance, Kubernetes Native Object Storage
 name: minio
-version: 1.1.0
-appVersion: master
+version: 1.2.1
+appVersion: RELEASE.2021-02-19T04-38-02Z
 keywords:
 - storage
 - object-storage

charts/minio/1.2.1/ix_values.yaml

@@ -0,0 +1,4 @@
+image:
+  repository: minio/minio
+  tag: RELEASE.2021-02-19T04-38-02Z
+  pullPolicy: IfNotPresent

charts/minio/1.2.1/migrations/migrate_from_1.0.0

@@ -5,6 +5,9 @@ import sys
 
 
 def migrate(values):
+    if values.get('appVolumeMounts'):
+        return values
+
     values.update({
         'appVolumeMounts': {
             'export': {

charts/minio/1.2.1/questions.yaml

@@ -11,49 +11,13 @@ groups:
 portals:
   web_portal:
     protocols:
-      - "http"
+      - "$kubernetes-resource_configmap_minio-config_protocol"
     host:
       - "$node_ip"
     ports:
       - "$variable-service.nodePort"
 
 questions:
-  # Image related
-  - variable: image
-    description: "Docker Image Details"
-    label: "Docker Image"
-    group: "Container Images"
-    schema:
-      type: dict
-      required: true
-      attrs:
-        - variable: repository
-          description: "Docker image repository"
-          label: "Image repository"
-          schema:
-            type: string
-            default: "minio/minio"
-            required: true
-        - variable: tag
-          description: "Tag to use for specified image"
-          label: "Image Tag"
-          schema:
-            type: string
-            default: "RELEASE.2020-11-19T23-48-16Z"
-        - variable: pullPolicy
-          description: "Docker Image Pull Policy"
-          label: "Image Pull Policy"
-          schema:
-            type: string
-            default: "IfNotPresent"
-            enum:
-              - value: "IfNotPresent"
-                description: "Only pull image if not present on host"
-              - value: "Always"
-                description: "Always pull image even if present on host"
-              - value: "Never"
-                description: "Never pull image even if it's not present on host"
-
   - variable: updateStrategy
     label: "Minio update strategy"
     group: "Workload Configuration"
@@ -138,6 +102,15 @@ questions:
             default: 9000
             required: true
 
+  - variable: certificate
+    description: "Minio Certificate"
+    label: "Minio Certificate"
+    group: "Minio Configuration"
+    schema:
+      type: int
+      $ref:
+        - "definitions/certificate"
+
   - variable: appVolumeMounts
     label: "Minio Storage"
     group: "Storage"

charts/minio/1.2.1/templates/_cert.tpl

@@ -0,0 +1,33 @@
+{{/*
+Formats volumeMount for Minio tls keys and trusted certs
+*/}}
+{{- define "minio.tlsKeysVolumeMount" -}}
+{{- if eq (include "minio.certAvailable" .) "true" -}}
+- name: cert-secret-volume
+  mountPath: "/etc/minio/certs"
+- name: trusted-cert-secret-volume
+  mountPath: "/etc/minio/certs/CAs"
+{{- end }}
+{{- end -}}
+
+{{/*
+Formats volume for Minio tls keys and trusted certs
+*/}}
+{{- define "minio.tlsKeysVolume" -}}
+{{- if eq (include "minio.certAvailable" .) "true" -}}
+- name: cert-secret-volume
+  secret:
+    secretName: {{ include "minio.secretName" . }}
+    items:
+    - key: certPublicKey
+      path: public.crt
+    - key: certPrivateKey
+      path: private.key
+- name: trusted-cert-secret-volume
+  secret:
+    secretName: {{ include "minio.secretName" . }}
+    items:
+    - key: certPublicKey
+      path: public.crt
+{{- end }}
+{{- end -}}

charts/minio/1.2.1/templates/_helpers.tpl

@@ -0,0 +1,40 @@
+{{/*
+Determine secret name.
+*/}}
+{{- define "minio.secretName" -}}
+{{- include "common.names.fullname" . -}}
+{{- end -}}
+
+
+{{/*
+Retrieve true/false if minio certificate is configured
+*/}}
+{{- define "minio.certAvailable" -}}
+{{- if .Values.certificate -}}
+{{- $values := (. | mustDeepCopy) -}}
+{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}}
+{{- template "common.resources.cert_present" $values -}}
+{{- else -}}
+{{- false -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/*
+Retrieve public key of minio certificate
+*/}}
+{{- define "minio.cert.publicKey" -}}
+{{- $values := (. | mustDeepCopy) -}}
+{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate "publicKey" true) -}}
+{{ include "common.resources.cert" $values }}
+{{- end -}}
+
+
+{{/*
+Retrieve private key of minio certificate
+*/}}
+{{- define "minio.cert.privateKey" -}}
+{{- $values := (. | mustDeepCopy) -}}
+{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}}
+{{ include "common.resources.cert" $values }}
+{{- end -}}

charts/minio/1.2.1/templates/configmap.yaml

@@ -0,0 +1,10 @@
+{{ $scheme := "http" }}
+{{ if eq (include "minio.certAvailable" .) "true" }}
+{{ $scheme = "https" }}
+{{ end }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: minio-config
+data:
+  protocol: {{ $scheme }}

charts/minio/1.2.1/templates/deployment.yaml

@@ -1,4 +1,3 @@
-{{ $scheme := "http" }}
 apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
@@ -29,13 +28,14 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
-          {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }}
+          volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
+          {{- include "minio.tlsKeysVolumeMount" . | nindent 12 }}
           command:
             - "/bin/sh"
             - "-ce"
-            - "/usr/bin/docker-entrypoint.sh minio server /export {{ (.Values.extraArgs | default list) | join " " }}"
+            - "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server /export {{ (.Values.extraArgs | default list) | join " " }}"
           ports:
-            - name: {{ $scheme }}
+            - name: http
               containerPort: 9000
           env:
             {{ $secretName := (include "minio.secretName" .) }}
@@ -44,3 +44,4 @@ spec:
             {{ $envList = mustAppend $envList (dict "name" "MINIO_SECRET_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }}
             {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }}
 {{ include "common.storage.allAppVolumes" .Values | nindent 6 }}
+{{- include "minio.tlsKeysVolume" . | nindent 8 }}

charts/minio/1.2.1/templates/secrets.yaml

@@ -7,3 +7,7 @@ type: Opaque
 data:
   accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }}
   secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }}
+  {{ if eq (include "minio.certAvailable" .) "true" }}
+  certPublicKey: {{ (include "minio.cert.publicKey" .) | toString | b64enc | quote }}
+  certPrivateKey: {{ (include "minio.cert.privateKey" .) | toString | b64enc | quote }}
+  {{ end }}

charts/minio/1.2.1/test_values.yaml

@@ -2,7 +2,7 @@
 ##
 image:
   repository: minio/minio
-  tag: RELEASE.2020-11-19T23-48-16Z
+  tag: RELEASE.2021-02-19T04-38-02Z
   pullPolicy: IfNotPresent
 
 ## Additional arguments to pass to minio binary
@@ -11,7 +11,7 @@ extraArgs: []
 updateStrategy: RollingUpdate
 
 service:
-  nodePort: 32001
+  nodePort: 32324
 
 environmentVariables: []
   ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html