Remove ConfigMap and bump Minio version (#10828)

Signed-off-by: Nitish Tiwari <nitish@minio.io>
This commit is contained in:
Nitish Tiwari
2019-01-29 11:49:07 -08:00
committed by Kubernetes Prow Robot
parent c6f0147370
commit d4b60b891d
6 changed files with 11 additions and 156 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
apiVersion: v1
description: Minio is a high performance distributed object storage server, designed for large-scale private cloud infrastructure.
name: minio
version: 2.4.0
appVersion: RELEASE.2019-01-10T00-21-20Z
version: 2.4.1
appVersion: RELEASE.2019-01-16T21-44-08Z
keywords:
- storage
- object-storage
+1 -1
View File
@@ -93,7 +93,7 @@ The following table lists the configurable parameters of the Minio chart and the
| Parameter | Description | Default |
|----------------------------|-------------------------------------|---------------------------------------------------------|
| `image.repository` | Image repository | `minio/minio` |
| `image.tag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2019-01-10T00-21-20Z`|
| `image.tag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2019-01-16T21-44-08Z`|
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `mcImage.repository` | Client image repository | `minio/mc` |
| `mcImage.tag` | mc image tag. Possible values listed [here](https://hub.docker.com/r/minio/mc/tags/).| `RELEASE.2019-01-10T00-38-22Z`|
-126
View File
@@ -10,129 +10,3 @@ metadata:
data:
initialize: |-
{{ include (print $.Template.BasePath "/_helper_create_bucket.txt") . | indent 4 }}
config.json: |-
{
"version": "26",
"credential": {
"accessKey": {{ .Values.accessKey | quote }},
"secretKey": {{ .Values.secretKey | quote }}
},
"region": {{ .Values.minioConfig.region | quote }},
"worm": {{ .Values.minioConfig.worm | quote }},
"storageclass": {
"standard": {{ .Values.minioConfig.storageClass.standardStorageClass | quote }},
"rrs": {{ .Values.minioConfig.storageClass.reducedRedundancyStorageClass | quote }}
},
"cache": {
"drives": {{ .Values.minioConfig.cache.drives }},
"expiry": {{ .Values.minioConfig.cache.expiry | int }},
"maxuse": {{ .Values.minioConfig.cache.maxuse | int }},
"exclude": {{ .Values.minioConfig.cache.exclude }}
},
"notify": {
"amqp": {
"1": {
"enable": {{ .Values.minioConfig.aqmp.enable }},
"url": {{ .Values.minioConfig.aqmp.url | quote }},
"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 }},
"internal": {{ .Values.minioConfig.aqmp.internal }},
"noWait": {{ .Values.minioConfig.aqmp.noWait }},
"autoDeleted": {{ .Values.minioConfig.aqmp.autoDeleted }}
}
},
"nats": {
"1": {
"enable": {{ .Values.minioConfig.nats.enable }},
"address": {{ .Values.minioConfig.nats.address | quote }},
"subject": {{ .Values.minioConfig.nats.subject | quote }},
"username": {{ .Values.minioConfig.nats.username | quote }},
"password": {{ .Values.minioConfig.nats.password | quote }},
"token": {{ .Values.minioConfig.nats.token | quote }},
"secure": {{ .Values.minioConfig.nats.secure }},
"pingInterval": {{ .Values.minioConfig.nats.pingInterval | int64 }},
"streaming": {
"enable": {{ .Values.minioConfig.nats.enableStreaming }},
"clusterID": {{ .Values.minioConfig.nats.clusterID | quote }},
"clientID": {{ .Values.minioConfig.nats.clientID | quote }},
"async": {{ .Values.minioConfig.nats.async }},
"maxPubAcksInflight": {{ .Values.minioConfig.nats.maxPubAcksInflight | int }}
}
}
},
"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 }}
}
},
"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 }}
}
},
"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 }},
"port": {{ .Values.minioConfig.postgresql.port | quote }},
"user": {{ .Values.minioConfig.postgresql.user | quote }},
"password": {{ .Values.minioConfig.postgresql.password | quote }},
"database": {{ .Values.minioConfig.postgresql.database | quote }}
}
},
"kafka": {
"1": {
"enable": {{ .Values.minioConfig.kafka.enable }},
"brokers": {{ .Values.minioConfig.kafka.brokers }},
"topic": {{ .Values.minioConfig.kafka.topic | quote }}
}
},
"webhook": {
"1": {
"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 }}
}
},
"mqtt": {
"1": {
"enable": {{ .Values.minioConfig.mqtt.enable }},
"broker": {{ .Values.minioConfig.mqtt.broker | quote }},
"topic": {{ .Values.minioConfig.mqtt.topic | quote }},
"qos": {{ .Values.minioConfig.mqtt.qos | int }},
"clientId": {{ .Values.minioConfig.mqtt.clientId | quote }},
"username": {{ .Values.minioConfig.mqtt.username | quote }},
"password": {{ .Values.minioConfig.mqtt.password | quote }},
"reconnectInterval": {{ .Values.minioConfig.mqtt.reconnectInterval | int }},
"keepAliveInterval": {{ .Values.minioConfig.mqtt.keepAliveInterval | int }}
}
}
}
}
+5 -16
View File
@@ -50,20 +50,17 @@ spec:
{{- if .Values.s3gateway.enabled }}
command: [ "/bin/sh",
"-ce",
"cp /tmp/config.json {{ .Values.configPath }} &&
/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway s3" ]
"/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway s3" ]
{{- else }}
{{- if .Values.azuregateway.enabled }}
command: [ "/bin/sh",
"-ce",
"cp /tmp/config.json {{ .Values.configPath }} &&
/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway azure" ]
"/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway azure" ]
{{- else }}
{{- if .Values.gcsgateway.enabled }}
command: [ "/bin/sh",
"-ce",
"cp /tmp/config.json {{ .Values.configPath }} &&
/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway gcs {{ .Values.gcsgateway.projectId }}" ]
"/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway gcs {{ .Values.gcsgateway.projectId }}" ]
{{- else }}
{{- if .Values.ossgateway.enabled }}
command: [ "/bin/sh",
@@ -74,13 +71,11 @@ spec:
{{- if .Values.nasgateway.enabled }}
command: [ "/bin/sh",
"-ce",
"cp /tmp/config.json {{ .Values.configPath }} &&
/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway nas {{ .Values.mountPath }}" ]
"/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway nas {{ .Values.mountPath }}" ]
{{- else }}
command: [ "/bin/sh",
"-ce",
"cp /tmp/config.json {{ .Values.configPath }} &&
/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server {{ .Values.mountPath }}" ]
"/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server {{ .Values.mountPath }}" ]
{{- end }}
{{- end }}
{{- end }}
@@ -99,9 +94,6 @@ spec:
mountPath: "/etc/credentials"
readOnly: true
{{- end }}
- name: minio-server-config
mountPath: "/tmp/config.json"
subPath: config.json
- name: minio-config-dir
mountPath: {{ .Values.configPath }}
{{- if .Values.tls.enabled }}
@@ -182,9 +174,6 @@ spec:
emptyDir: {}
{{- end }}
{{- end }}
- name: minio-server-config
configMap:
name: {{ template "minio.fullname" . }}
- name: minio-user
secret:
secretName: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ template "minio.fullname" . }}{{ end }}
+2 -10
View File
@@ -35,16 +35,14 @@ spec:
{{- if .Values.tls.enabled }}
command: [ "/bin/sh",
"-ce",
"cp /tmp/config.json {{ .Values.configPath }} &&
/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server
"/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server
{{- range $i := until $nodeCount }}
https://{{ template `minio.fullname` $ }}-{{ $i }}.{{ template `minio.fullname` $ }}.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}{{ $.Values.mountPath }}
{{- end }}" ]
{{ else }}
command: [ "/bin/sh",
"-ce",
"cp /tmp/config.json {{ .Values.configPath }} &&
/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server
"/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server
{{- range $i := until $nodeCount }}
http://{{ template `minio.fullname` $ }}-{{ $i }}.{{ template `minio.fullname` $ }}.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}{{ $.Values.mountPath }}
{{- end }}" ]
@@ -55,9 +53,6 @@ spec:
{{- if and .Values.persistence.enabled .Values.persistence.subPath }}
subPath: "{{ .Values.persistence.subPath }}"
{{- end }}
- name: minio-server-config
mountPath: "/tmp/config.json"
subPath: config.json
- name: minio-config-dir
mountPath: {{ .Values.configPath }}
{{- if .Values.tls.enabled }}
@@ -114,9 +109,6 @@ spec:
- name: minio-user
secret:
secretName: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ template "minio.fullname" . }}{{ end }}
- name: minio-server-config
configMap:
name: {{ template "minio.fullname" . }}
- name: minio-config-dir
emptyDir: {}
{{- if .Values.tls.enabled }}
+1 -1
View File
@@ -6,7 +6,7 @@ clusterDomain: cluster.local
##
image:
repository: minio/minio
tag: RELEASE.2019-01-10T00-21-20Z
tag: RELEASE.2019-01-16T21-44-08Z
pullPolicy: IfNotPresent
## Set default image, imageTag, and imagePullPolicy for the `mc` (the minio