From 6f0a655aefd6d2d39bd872ceddff93e2ff6e80db Mon Sep 17 00:00:00 2001
From: Matthew Ellis <matthewellis1995@gmail.com>
Date: Thu, 10 Jan 2019 20:47:24 +0100
Subject: [PATCH] Add ability to create multiple buckets (#10076)

Signed-off-by: Matt Ellis <matthew.ellis@izettle.com>
---
 stable/minio/Chart.yaml                               |  2 +-
 stable/minio/README.md                                |  1 +
 stable/minio/templates/_helper_create_bucket.txt      |  8 ++++++++
 .../templates/post-install-create-bucket-job.yaml     |  2 +-
 stable/minio/values.yaml                              | 11 +++++++++++
 5 files changed, 22 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 stable/minio/README.md
 mode change 100644 => 100755 stable/minio/templates/_helper_create_bucket.txt
 mode change 100644 => 100755 stable/minio/templates/post-install-create-bucket-job.yaml
 mode change 100644 => 100755 stable/minio/values.yaml

diff --git a/stable/minio/Chart.yaml b/stable/minio/Chart.yaml
index 3b7a8c9082..36a62aa872 100755
--- a/stable/minio/Chart.yaml
+++ b/stable/minio/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Minio is a high performance distributed object storage server, designed for large-scale private cloud infrastructure.
 name: minio
-version: 2.3.0
+version: 2.3.1
 appVersion: RELEASE.2018-12-06T01-27-43Z
 keywords:
 - storage
diff --git a/stable/minio/README.md b/stable/minio/README.md
old mode 100644
new mode 100755
index 5dd84652be..299dddbd2a
--- a/stable/minio/README.md
+++ b/stable/minio/README.md
@@ -141,6 +141,7 @@ The following table lists the configurable parameters of the Minio chart and the
 | `defaultBucket.name`       | Bucket name                         | `bucket`                                                |
 | `defaultBucket.policy`     | Bucket policy                       | `none`                                                  |
 | `defaultBucket.purge`      | Purge the bucket if already exists  | `false`                                                 |
+| `buckets`                  | List of buckets to create after minio install  | `[]`                                         |
 | `s3gateway.enabled`        | Use minio as a [s3 gateway](https://github.com/minio/minio/blob/master/docs/gateway/s3.md)| `false` |
 | `s3gateway.replicas`       | Number of s3 gateway instances to run in parallel | `4` |
 | `azuregateway.enabled`     | Use minio as an [azure gateway](https://docs.minio.io/docs/minio-gateway-for-azure)| `false`  |
diff --git a/stable/minio/templates/_helper_create_bucket.txt b/stable/minio/templates/_helper_create_bucket.txt
old mode 100644
new mode 100755
index 582c7cd4b7..016166c0c0
--- a/stable/minio/templates/_helper_create_bucket.txt
+++ b/stable/minio/templates/_helper_create_bucket.txt
@@ -71,5 +71,13 @@ createBucket() {
 
 # Try connecting to Minio instance
 connectToMinio
+
+{{- if or .Values.defaultBucket.enabled }}
 # Create the bucket
 createBucket {{ .Values.defaultBucket.name }} {{ .Values.defaultBucket.policy }} {{ .Values.defaultBucket.purge }}
+{{ else if .Values.buckets }}
+# Create the buckets
+{{- range .Values.buckets }}
+createBucket {{ .name }} {{ .policy }} {{ .purge }} 
+{{- end }}
+{{- end }}
diff --git a/stable/minio/templates/post-install-create-bucket-job.yaml b/stable/minio/templates/post-install-create-bucket-job.yaml
old mode 100644
new mode 100755
index b0b9cd3785..feb03c98ae
--- a/stable/minio/templates/post-install-create-bucket-job.yaml
+++ b/stable/minio/templates/post-install-create-bucket-job.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.defaultBucket.enabled }}
+{{- if or .Values.defaultBucket.enabled .Values.buckets }}
 apiVersion: batch/v1
 kind: Job
 metadata:
diff --git a/stable/minio/values.yaml b/stable/minio/values.yaml
old mode 100644
new mode 100755
index 6f0455656f..fc3d52a654
--- a/stable/minio/values.yaml
+++ b/stable/minio/values.yaml
@@ -156,6 +156,17 @@ defaultBucket:
   ## Purge if bucket exists already
   purge: false
 
+## Create multiple buckets after minio install
+## Enabling `defaultBucket` will take priority over this list
+##
+buckets: []
+  # - name: bucket1
+  #   policy: none
+  #   purge: false
+  # - name: bucket2
+  #   policy: none
+  #   purge: false
+
 s3gateway:
   enabled: false
   replicas: 4