diff --git a/stable/minio/Chart.yaml b/stable/minio/Chart.yaml index 95ea9ec715..018ca6e5b9 100755 --- a/stable/minio/Chart.yaml +++ b/stable/minio/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Distributed object storage server built for cloud applications and devops. name: minio -version: 0.1.0 +version: 0.1.1 keywords: - storage - object-storage diff --git a/stable/minio/README.md b/stable/minio/README.md index cc971f39a5..7f358d2114 100644 --- a/stable/minio/README.md +++ b/stable/minio/README.md @@ -75,7 +75,7 @@ The following tables lists the configurable parameters of the Minio chart and th | Parameter | Description | Default | |----------------------------|-------------------------------------|---------------------------------------------------------| | `image` | Minio image name | `minio/minio` | -| `imageTag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2017-03-16T21-50-32Z`| +| `imageTag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2017-05-05T01-14-51Z`| | `imagePullPolicy` | Image pull policy | `Always` | | `mode` | Minio server mode (`standalone`, `shared` or `distributed`)| `standalone` | | `replicas` | Number of nodes (applicable only for Minio distributed mode). Should be 4 <= x <= 16 | `4` | diff --git a/stable/minio/templates/minio_deployment.yaml b/stable/minio/templates/minio_deployment.yaml index 11e1ce70d6..ed4f71722e 100644 --- a/stable/minio/templates/minio_deployment.yaml +++ b/stable/minio/templates/minio_deployment.yaml @@ -42,7 +42,6 @@ spec: - name: minio image: {{ .Values.image }}:{{ .Values.imageTag }} imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["minio"] {{- if .Values.configPath }} args: ["-C", "{{ .Values.configPath }}", "server", "{{ .Values.mountPath }}"] {{- else }} diff --git a/stable/minio/templates/minio_distributed_configmap.yaml b/stable/minio/templates/minio_distributed_configmap.yaml deleted file mode 100644 index 2908baebe9..0000000000 --- a/stable/minio/templates/minio_distributed_configmap.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq .Values.mode "distributed" }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "fullname" . }}-cm - labels: - app: {{ template "fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -{{ $nodeCount := .Values.replicas | int }} -data: - start.sh: | - #!/bin/sh - {{- if .Values.configPath }} - minio -C {{ .Values.configPath }} server \ - {{- else }} - minio server \ - {{- end }} - {{- range $i := until $nodeCount }} - http://{{ template "fullname" $ }}-{{$i}}.{{ template "fullname" $ }}.{{ $.Release.Namespace }}.svc.cluster.local{{ $.Values.mountPath }} \ -{{- end }} -{{- end }} diff --git a/stable/minio/templates/minio_statefulset.yaml b/stable/minio/templates/minio_statefulset.yaml index 4738c2402e..344db7beb2 100644 --- a/stable/minio/templates/minio_statefulset.yaml +++ b/stable/minio/templates/minio_statefulset.yaml @@ -1,4 +1,5 @@ {{- if eq .Values.mode "distributed" }} +{{ $nodeCount := .Values.replicas | int }} apiVersion: v1 kind: Service metadata: @@ -46,9 +47,6 @@ spec: - name: minio-user secret: secretName: {{ template "fullname" . }}-user - - name: minio-configmap - configMap: - name: {{ template "fullname" . }}-cm - name: minio-server-config configMap: name: {{ template "fullname" . }}-config-cm @@ -56,17 +54,21 @@ spec: - name: minio image: {{ .Values.image }}:{{ .Values.imageTag }} imagePullPolicy: {{ .Values.imagePullPolicy }} - command: - - /bin/sh - - /go/bin/start.sh + {{- if .Values.configPath }} + args: + - -C {{ .Values.configPath }} server + {{- else }} + args: + - server + {{- range $i := until $nodeCount }} + - http://{{ template "fullname" $ }}-{{$i}}.{{ template "fullname" $ }}.{{ $.Release.Namespace }}.svc.cluster.local{{ $.Values.mountPath }} + {{- end }} + {{- end }} volumeMounts: - name: export mountPath: {{ .Values.mountPath }} - name: minio-server-config mountPath: {{ default "/root/.minio/" .Values.configPath | quote }} - - name: minio-configmap - mountPath: /go/bin/start.sh - subPath: start.sh ports: - name: service containerPort: 9000 diff --git a/stable/minio/templates/minioconfig_configmap.yaml b/stable/minio/templates/minioconfig_configmap.yaml index 388b7ea1ea..910af7b11d 100644 --- a/stable/minio/templates/minioconfig_configmap.yaml +++ b/stable/minio/templates/minioconfig_configmap.yaml @@ -10,21 +10,20 @@ metadata: data: config.json: |- { - "version": "13", + "version": "18", "credential": { "accessKey": {{ .Values.accessKey | quote }}, "secretKey": {{ .Values.secretKey | quote }} }, "region": "us-east-1", + "browser": "on", "logger": { "console": { - "enable": true, - "level": "fatal" + "enable": true }, "file": { "enable": false, - "fileName": "", - "level": "" + "fileName": "" } }, "notify": { @@ -35,6 +34,7 @@ data: "exchange": {{ .Values.minioConfig.aqmp.exchange | quote }}, "routingKey": {{ .Values.minioConfig.aqmp.routingKey | quote }}, "exchangeType": {{ .Values.minioConfig.aqmp.exchangeType | quote }}, + "deliveryMode": {{ .Values.minioConfig.aqmp.deliveryMode }}, "mandatory": {{ .Values.minioConfig.aqmp.mandatory }}, "immediate": {{ .Values.minioConfig.aqmp.immediate }}, "durable": {{ .Values.minioConfig.aqmp.durable }}, @@ -65,6 +65,7 @@ data: "elasticsearch": { "1": { "enable": {{ .Values.minioConfig.elasticsearch.enable }}, + "format": {{ .Values.minioConfig.elasticsearch.format | quote }}, "url": {{ .Values.minioConfig.elasticsearch.url | quote }}, "index": {{ .Values.minioConfig.elasticsearch.index | quote }} } @@ -72,6 +73,7 @@ data: "redis": { "1": { "enable": {{ .Values.minioConfig.redis.enable }}, + "format": {{ .Values.minioConfig.redis.format | quote }}, "address": {{ .Values.minioConfig.redis.address | quote }}, "password": {{ .Values.minioConfig.redis.password | quote }}, "key": {{ .Values.minioConfig.redis.key | quote }} @@ -80,6 +82,7 @@ data: "postgresql": { "1": { "enable": {{ .Values.minioConfig.postgresql.enable }}, + "format": {{ .Values.minioConfig.postgresql.format | quote }}, "connectionString": {{ .Values.minioConfig.postgresql.connectionString | quote }}, "table": {{ .Values.minioConfig.postgresql.table | quote }}, "host": {{ .Values.minioConfig.postgresql.host | quote }}, @@ -101,6 +104,19 @@ data: "enable": {{ .Values.minioConfig.webhook.enable }}, "endpoint": {{ .Values.minioConfig.webhook.endpoint | quote }} } + }, + "mysql": { + "1": { + "enable": {{ .Values.minioConfig.mysql.enable }}, + "format": {{ .Values.minioConfig.mysql.format | quote }}, + "dsnString": {{ .Values.minioConfig.mysql.dsnString | quote }}, + "table": {{ .Values.minioConfig.mysql.table | quote }}, + "host": {{ .Values.minioConfig.mysql.host | quote }}, + "port": {{ .Values.minioConfig.mysql.port | quote }}, + "user": {{ .Values.minioConfig.mysql.user | quote }}, + "password": {{ .Values.minioConfig.mysql.password | quote }}, + "database": {{ .Values.minioConfig.mysql.database | quote }} + } } } } diff --git a/stable/minio/values.yaml b/stable/minio/values.yaml index 78df14fca0..acc9e49153 100644 --- a/stable/minio/values.yaml +++ b/stable/minio/values.yaml @@ -3,7 +3,7 @@ ## Distributed Minio ref: https://docs.minio.io/docs/distributed-minio-quickstart-guide ## image: "minio/minio" -imageTag: "RELEASE.2017-03-16T21-50-32Z" +imageTag: "RELEASE.2017-05-05T01-14-51Z" imagePullPolicy: "Always" mode: "standalone" @@ -60,6 +60,7 @@ minioConfig: exchange: "" routingKey: "" exchangeType: "" + deliveryMode: 0 mandatory: false immediate: false durable: false @@ -82,15 +83,18 @@ minioConfig: maxPubAcksInflight: 0 elasticsearch: enable: false + format: "namespace" url: "" index: "" redis: enable: false + format: "namespace" address: "" password: "" key: "" postgresql: enable: false + format: "namespace" connectionString: "" table: "" host: "" @@ -105,3 +109,13 @@ minioConfig: webhook: enable: false endpoint: "" + mysql: + enable: false + format: "namespace" + dsnString: "" + table: "" + host: "" + port: "" + user: "" + password: "" + database: ""